| author | Alan Coopersmith <Alan.Coopersmith@Oracle.COM> |
| Mon, 25 Apr 2016 23:38:11 -0700 | |
| changeset 5892 | 54e11e77ee33 |
| parent 5391 | 5aa4a8c4577f |
| child 7900 | 18f1ac4be9fb |
| permissions | -rw-r--r-- |
|
5391
5aa4a8c4577f
22536285 update ggrep to 2.22
April Chin <april.chin@oracle.com>
parents:
4402
diff
changeset
|
1 |
# This patch fixes a test failure in gnulib-tests/test-localename |
|
4402
b7cd2462c58f
20460412 GGREP should have some master test results to compare against
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
2 |
# __getlocalename_l is an Oracle private interface. |
|
b7cd2462c58f
20460412 GGREP should have some master test results to compare against
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
3 |
# Do not send this patch upstream. |
|
b7cd2462c58f
20460412 GGREP should have some master test results to compare against
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
4 |
|
|
5391
5aa4a8c4577f
22536285 update ggrep to 2.22
April Chin <april.chin@oracle.com>
parents:
4402
diff
changeset
|
5 |
--- grep-2.22-orig/gnulib-tests/localename.c 2015-10-24 13:07:13.000000000 -0700 |
|
5aa4a8c4577f
22536285 update ggrep to 2.22
April Chin <april.chin@oracle.com>
parents:
4402
diff
changeset
|
6 |
+++ grep-2.22/gnulib-tests/localename.c 2016-01-19 17:18:20.049731748 -0800 |
|
5aa4a8c4577f
22536285 update ggrep to 2.22
April Chin <april.chin@oracle.com>
parents:
4402
diff
changeset
|
7 |
@@ -2732,6 +2732,9 @@ gl_locale_name_thread_unsafe (int catego |
|
5aa4a8c4577f
22536285 update ggrep to 2.22
April Chin <april.chin@oracle.com>
parents:
4402
diff
changeset
|
8 |
# elif defined __sun && HAVE_GETLOCALENAME_L |
|
5aa4a8c4577f
22536285 update ggrep to 2.22
April Chin <april.chin@oracle.com>
parents:
4402
diff
changeset
|
9 |
/* Solaris >= 12. */ |
|
5aa4a8c4577f
22536285 update ggrep to 2.22
April Chin <april.chin@oracle.com>
parents:
4402
diff
changeset
|
10 |
return getlocalename_l (category, thread_locale); |
|
4402
b7cd2462c58f
20460412 GGREP should have some master test results to compare against
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
11 |
+# elif defined(sun) || defined(__sun) || defined(__sun__) |
|
b7cd2462c58f
20460412 GGREP should have some master test results to compare against
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
12 |
+ extern char * __getlocalename_l(int, locale_t); |
|
b7cd2462c58f
20460412 GGREP should have some master test results to compare against
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
13 |
+ return __getlocalename_l (category, thread_locale); |
|
5391
5aa4a8c4577f
22536285 update ggrep to 2.22
April Chin <april.chin@oracle.com>
parents:
4402
diff
changeset
|
14 |
# elif defined __ANDROID__ |
|
5aa4a8c4577f
22536285 update ggrep to 2.22
April Chin <april.chin@oracle.com>
parents:
4402
diff
changeset
|
15 |
return MB_CUR_MAX == 4 ? "C.UTF-8" : "C"; |
|
4402
b7cd2462c58f
20460412 GGREP should have some master test results to compare against
James Chang <james.c.chang@Oracle.COM>
parents:
diff
changeset
|
16 |
# endif |