X-Git-Url: https://pd.if.org/git/?p=pdclib;a=blobdiff_plain;f=functions%2Fstring%2Fstrcoll.c;h=09ada0445bb3decc17a3bd1986bfce8bf1d2e047;hp=16a5680b610c14ea5aaf078f60ced375095753b8;hb=da0f3f353d417fed71f358a48d5d5394145e460d;hpb=c3a9288707c2071ac38666bb23e1face3d2efa0c

diff --git a/functions/string/strcoll.c b/functions/string/strcoll.c
index 16a5680..09ada04 100644
--- a/functions/string/strcoll.c
+++ b/functions/string/strcoll.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* strcoll( const char *, const char * )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -10,22 +8,24 @@
 
 #ifndef REGTEST
 
-#include <locale.h>
+#include "_PDCLIB_locale.h"
 
 int strcoll( const char * s1, const char * s2 )
 {
-    while ( ( *s1 ) && ( _PDCLIB_lconv.ctype[(unsigned char)*s1].collation == _PDCLIB_lconv.ctype[(unsigned char)*s2].collation ) )
+    const _PDCLIB_ctype_t * ctype = _PDCLIB_threadlocale()->_CType;
+
+    while ( ( *s1 ) && ( ctype[(unsigned char)*s1].collation == ctype[(unsigned char)*s2].collation ) )
     {
         ++s1;
         ++s2;
     }
-    return ( _PDCLIB_lconv.ctype[(unsigned char)*s1].collation == _PDCLIB_lconv.ctype[(unsigned char)*s2].collation );
+    return ( ctype[(unsigned char)*s1].collation == ctype[(unsigned char)*s2].collation );
 }
 
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
+#include "_PDCLIB_test.h"
 
 int main( void )
 {