diff options
| -rw-r--r-- | localedata/tst-xlocale1.c | 6 | ||||
| -rw-r--r-- | localedata/tst-xlocale2.c | 22 |
2 files changed, 14 insertions, 14 deletions
diff --git a/localedata/tst-xlocale1.c b/localedata/tst-xlocale1.c index bfe978f485..6dcbccefdf 100644 --- a/localedata/tst-xlocale1.c +++ b/localedata/tst-xlocale1.c @@ -25,7 +25,7 @@ main (void) { int cnt; int result = 0; - __locale_t loc = __newlocale (1 << LC_ALL, "C", NULL); + locale_t loc = newlocale (1 << LC_ALL, "C", NULL); for (cnt = 0; cnt < ntests; ++cnt) { @@ -38,10 +38,10 @@ main (void) continue; } - printf ("\n__strcasecmp_l (\"%s\", \"%s\", loc)\n", + printf ("\nstrcasecmp_l (\"%s\", \"%s\", loc)\n", tests[cnt].str1, tests[cnt].str2); - r = __strcasecmp_l (tests[cnt].str1, tests[cnt].str2, loc); + r = strcasecmp_l (tests[cnt].str1, tests[cnt].str2, loc); if (tests[cnt].result == 0) { if (r != 0) diff --git a/localedata/tst-xlocale2.c b/localedata/tst-xlocale2.c index 224cccb12f..8d73d340ce 100644 --- a/localedata/tst-xlocale2.c +++ b/localedata/tst-xlocale2.c @@ -9,26 +9,26 @@ static int do_test (__locale_t l); int main (void) { - __locale_t l; - __locale_t l2; + locale_t l; + locale_t l2; int result; - l = __newlocale (1 << LC_ALL, "de_DE.ISO-8859-1", NULL); + l = newlocale (1 << LC_ALL, "de_DE.ISO-8859-1", NULL); if (l == NULL) { - printf ("__newlocale failed: %m\n"); + printf ("newlocale failed: %m\n"); exit (EXIT_FAILURE); } puts ("Running tests of created locale"); result = do_test (l); - l2 = __duplocale (l); + l2 = duplocale (l); if (l2 == NULL) { - printf ("__duplocale failed: %m\n"); + printf ("duplocale failed: %m\n"); exit (EXIT_FAILURE); } - __freelocale (l); + freelocale (l); puts ("Running tests of duplicated locale"); result |= do_test (l2); @@ -43,7 +43,7 @@ static const char exx[] = "11111111111111110111111000000000000000000000000000"; static int -do_test (__locale_t l) +do_test (locale_t l) { int result = 0; int n; @@ -56,9 +56,9 @@ do_test (__locale_t l) result = 1; \ } - DO_TEST (__isdigit_l, exd); - DO_TEST (__isalpha_l, exa); - DO_TEST (__isxdigit_l, exx); + DO_TEST (isdigit_l, exd); + DO_TEST (isalpha_l, exa); + DO_TEST (isxdigit_l, exx); return result; } |