author | Rich Burridge <rich.burridge@oracle.com> |
Tue, 18 Apr 2017 09:16:01 -0700 | |
changeset 7900 | 18f1ac4be9fb |
parent 5391 | 5aa4a8c4577f |
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 |
7900
18f1ac4be9fb
25651768 Update ggrep to version 3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
5391
diff
changeset
|
2 |
# __getlocalename_l is an Oracle private interface. |
4402
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 |
|
7900
18f1ac4be9fb
25651768 Update ggrep to version 3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
5391
diff
changeset
|
5 |
--- grep-3.0/gnulib-tests/localename.c.orig 2017-03-01 07:14:51.129981406 +0000 |
18f1ac4be9fb
25651768 Update ggrep to version 3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
5391
diff
changeset
|
6 |
+++ grep-3.0/gnulib-tests/localename.c 2017-03-01 07:15:51.216928103 +0000 |
18f1ac4be9fb
25651768 Update ggrep to version 3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
5391
diff
changeset
|
7 |
@@ -49,6 +49,9 @@ |
18f1ac4be9fb
25651768 Update ggrep to version 3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
5391
diff
changeset
|
8 |
# if defined __sun && HAVE_GETLOCALENAME_L |
18f1ac4be9fb
25651768 Update ggrep to version 3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
5391
diff
changeset
|
9 |
/* Solaris >= 12. */ |
18f1ac4be9fb
25651768 Update ggrep to version 3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
5391
diff
changeset
|
10 |
extern char * getlocalename_l(int, locale_t); |
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__) |
7900
18f1ac4be9fb
25651768 Update ggrep to version 3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
5391
diff
changeset
|
12 |
+ extern char * __getlocalename_l(int, locale_t); |
18f1ac4be9fb
25651768 Update ggrep to version 3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
5391
diff
changeset
|
13 |
+ return __getlocalename_l (category, thread_locale); |
18f1ac4be9fb
25651768 Update ggrep to version 3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
5391
diff
changeset
|
14 |
# endif |
18f1ac4be9fb
25651768 Update ggrep to version 3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
5391
diff
changeset
|
15 |
#endif |
18f1ac4be9fb
25651768 Update ggrep to version 3.0
Rich Burridge <rich.burridge@oracle.com>
parents:
5391
diff
changeset
|
16 |