X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstring%2Fstrxfrm.c;h=3692257b234f1fa02e42297ec0749390f6bc5f2f;hb=abc15df6b9fae3374d24c7cf5c3ab94c605b2a6d;hp=4f5e4a099bb1902f502b26dce62faa77ef1dce97;hpb=c3a9288707c2071ac38666bb23e1face3d2efa0c;p=pdclib

diff --git a/functions/string/strxfrm.c b/functions/string/strxfrm.c
index 4f5e4a0..3692257 100644
--- a/functions/string/strxfrm.c
+++ b/functions/string/strxfrm.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* strxfrm( char *, const char *, size_t )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -10,17 +8,18 @@
 
 #ifndef REGTEST
 
-#include <locale.h>
+#include "_PDCLIB_locale.h"
 
 size_t strxfrm( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2, size_t n )
 {
+    const _PDCLIB_ctype_t *ctype = _PDCLIB_threadlocale()->_CType;
     size_t len = strlen( s2 );
     if ( len < n )
     {
         /* Cannot use strncpy() here as the filling of s1 with '\0' is not part
            of the spec.
         */
-        while ( n-- && ( *s1++ = _PDCLIB_lconv.ctype[(unsigned char)*s2++].collation ) );
+        while ( n-- && ( *s1++ = ctype[(unsigned char)*s2++].collation ) );
     }
     return len;
 }
@@ -28,7 +27,7 @@ size_t strxfrm( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2, si
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
+#include "_PDCLIB_test.h"
 
 int main( void )
 {