olga / rpms / glibc

Forked from rpms/glibc 5 years ago
Clone

Blame SOURCES/glibc-rh1505492-undef-obstack.patch

00db10
Fix -Wundef warnings.  Upstream addressed this as part of this commit:
00db10
00db10
commit b100f9aa77027e4371154820ea8a0353bfd13223
00db10
Author: Will Newton <will.newton@linaro.org>
00db10
Date:   Mon Jun 23 16:53:30 2014 +0100
00db10
00db10
    malloc/obstack: Merge from gnulib
00db10
00db10
diff --git a/malloc/obstack.c b/malloc/obstack.c
00db10
index e3ce53f987727eca..2b103727e010b417 100644
00db10
--- a/malloc/obstack.c
00db10
+++ b/malloc/obstack.c
00db10
@@ -56,10 +56,10 @@
00db10
 #ifndef ELIDE_CODE
00db10
 
00db10
 
00db10
-# if HAVE_INTTYPES_H
00db10
+# if _LIBC || HAVE_INTTYPES_H
00db10
 #  include <inttypes.h>
00db10
 # endif
00db10
-# if HAVE_STDINT_H || defined _LIBC
00db10
+# if _LIBC || HAVE_STDINT_H
00db10
 #  include <stdint.h>
00db10
 # endif
00db10
 
00db10
diff --git a/malloc/obstack.h b/malloc/obstack.h
00db10
index a791823cf3f18348..69e92d1146b02eb1 100644
00db10
--- a/malloc/obstack.h
00db10
+++ b/malloc/obstack.h
00db10
@@ -250,13 +250,6 @@ extern int obstack_exit_failure;
00db10
 #define obstack_memory_used(h) _obstack_memory_used (h)
00db10
 
00db10
 #if defined __GNUC__
00db10
-/* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and
00db10
-   does not implement __extension__.  But that compiler doesn't define
00db10
-   __GNUC_MINOR__.  */
00db10
-# if __GNUC__ < 2 || (__NeXT__ && !__GNUC_MINOR__)
00db10
-#  define __extension__
00db10
-# endif
00db10
-
00db10
 /* For GNU C, if not -traditional,
00db10
    we can define these macros to compute all args only once
00db10
    without using a global variable.