From: Roland McGrath <roland@hack.frob.com>
Date: Mon, 5 May 2014 20:06:18 +0000 (-0700)
Subject: Fix -Wundef issues in generated errlist.c.
X-Git-Tag: upstream/2.30~7550
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eb1ed03dafcd9a7ea6e95b958413342e20b35968;p=external%2Fglibc.git

Fix -Wundef issues in generated errlist.c.
---

diff --git a/ChangeLog b/ChangeLog
index ad0484b..25149d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-05-05  Roland McGrath  <roland@hack.frob.com>
+
+	* sysdeps/gnu/errlist.awk (BEGIN): Emit an initial #define of ERR_MAX
+	to 0, so the first #if test emitted later doesn't see it undefined.
+	(END): Emit "!defined ERRLIST_NO_COMPAT" to match what BEGIN does.
+	* sysdeps/gnu/errlist.c: Regenerated.
+
 2014-05-04  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 
 	* sysdeps/powerpc/powerpc32/power4/multiarch/memchr-ppc32.c
diff --git a/sysdeps/gnu/errlist.awk b/sysdeps/gnu/errlist.awk
index 654984b..7fa5305 100644
--- a/sysdeps/gnu/errlist.awk
+++ b/sysdeps/gnu/errlist.awk
@@ -52,6 +52,7 @@ BEGIN {
     print "#ifdef ERR_MAX";
     print "# define ERRLIST_SIZE ERR_MAX + 1";
     print "#else"
+    print "# define ERR_MAX 0";
     print "# define ERRLIST_SIZE";
     print "#endif";
 
@@ -109,7 +110,7 @@ END {
   print "  (sizeof _sys_errlist_internal / sizeof _sys_errlist_internal [0])";
   print "const int _sys_nerr_internal = NERR;"
   print "";
-  print "#if !defined NOT_IN_libc && !ERRLIST_NO_COMPAT";
+  print "#if !defined NOT_IN_libc && !defined ERRLIST_NO_COMPAT";
   print "# include <errlist-compat.c>";
   print "#endif";
   print "";
diff --git a/sysdeps/gnu/errlist.c b/sysdeps/gnu/errlist.c
index 2303453..8381434 100644
--- a/sysdeps/gnu/errlist.c
+++ b/sysdeps/gnu/errlist.c
@@ -13,6 +13,7 @@
 #ifdef ERR_MAX
 # define ERRLIST_SIZE ERR_MAX + 1
 #else
+# define ERR_MAX 0
 # define ERRLIST_SIZE
 #endif
 const char *const _sys_errlist_internal[ERRLIST_SIZE] =
@@ -1479,7 +1480,7 @@ TRANS error; @pxref{Cancel AIO Operations}. */
   (sizeof _sys_errlist_internal / sizeof _sys_errlist_internal [0])
 const int _sys_nerr_internal = NERR;
 
-#if !defined NOT_IN_libc && !ERRLIST_NO_COMPAT
+#if !defined NOT_IN_libc && !defined ERRLIST_NO_COMPAT
 # include <errlist-compat.c>
 #endif