Fix localealias.c fgets_unlocked namespace (bug 17589).

intl/localealias.c is brought in by ISO C functions, but uses
fgets_unlocked, which is not an ISO C function.  This patch changes
this to use __fgets_unlocked.

Tested for x86_64 (testsuite, and that stripped installed shared
libraries are unchanged by the patch).

	[BZ #17589]
	* intl/localealias.c [_LIBC] (FGETS): Use __fgets_unlocked instead
	of fgets_unlocked.

diff --git a/ChangeLog b/ChangeLog
index 9ef09070b778fe85aaa4f6a0976b69dc8afe64f1..177a6d75762fc2196bd62dd7426b5e73abda3ead 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2014-11-12  Joseph Myers  <joseph@codesourcery.com>
 
+       [BZ #17589]
+       * intl/localealias.c [_LIBC] (FGETS): Use __fgets_unlocked instead
+       of fgets_unlocked.
+
        [BZ #17585]
        * string/memmem.c [!_LIBC] (__memmem): Define to memmem.
        (memmem): Rename to __memmem and define as weak alias of

diff --git a/NEWS b/NEWS
index 27969e0e3ae983e6a354b2fc89771f42c059a19b..918b4a1a8271cde6fc5bdf998591ce8cebe0c6db 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -11,7 +11,8 @@ Version 2.21
 
   6652, 12926, 14132, 14138, 14171, 15215, 15884, 17266, 17344, 17363,
   17370, 17371, 17411, 17460, 17475, 17485, 17501, 17506, 17508, 17522,
-  17555, 17570, 17571, 17572, 17573, 17574, 17582, 17583, 17584, 17585.
+  17555, 17570, 17571, 17572, 17573, 17574, 17582, 17583, 17584, 17585,
+  17589.
 
 * New locales: tu_IN, bh_IN.
 \f

diff --git a/intl/localealias.c b/intl/localealias.c
index 9ab432885b095a3282ba81a0f53ff5e24738b34d..1d3f8ebabfdfbd654b176d27a08d8802fd4b37f5 100644 (file)
--- a/intl/localealias.c
+++ b/intl/localealias.c
@@ -84,7 +84,7 @@ __libc_lock_define_initialized (static, lock);
 /* Some optimizations for glibc.  */
 #ifdef _LIBC
 # define FEOF(fp)              feof_unlocked (fp)
-# define FGETS(buf, n, fp)     fgets_unlocked (buf, n, fp)
+# define FGETS(buf, n, fp)     __fgets_unlocked (buf, n, fp)
 #else
 # define FEOF(fp)              feof (fp)
 # define FGETS(buf, n, fp)     fgets (buf, n, fp)