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

diff --git a/functions/string/strcoll.c b/functions/string/strcoll.c
index 16a5680..b6a4cd6 100644
--- a/functions/string/strcoll.c
+++ b/functions/string/strcoll.c
@@ -10,16 +10,18 @@
 
 #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 ) )
+    _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