PDCLIB-1 PDCLIB-2 PDCLIB-9 PDCLIB-12: Add thread specific locale support; migrate...

[pdclib] / functions / string / strcoll.c

diff --git a/functions/string/strcoll.c b/functions/string/strcoll.c
index 16a5680b610c14ea5aaf078f60ced375095753b8..b6a4cd6d242aa0e195d93e221816162f4c2d73bb 100644 (file)
--- 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