From: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Thu, 10 Jul 2014 08:48:13 +0000 (+0530)
Subject: Fix -Wundef warning for HAVE_OBSTACK
X-Git-Tag: upstream/2.30~7115
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c3c7c3604fdf934d7a8ec70d79915cd8c8984ad1;p=external%2Fglibc.git

Fix -Wundef warning for HAVE_OBSTACK

Remove the HAVE_OBSTACK macro check and include obstack check in
include path order since we don't have a copy of obstack.h in the
current directory.
---

diff --git a/ChangeLog b/ChangeLog
index 72e9cf9..dc0b76c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2014-07-10  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
+	* locale/programs/simple-hash.c [!HAVE_OBSTACK]: Remove code.
+
 	[BZ #17125]
 	* sysdeps/unix/sysv/linux/check_pf.c (cache): Don't use
 	libc_freeres_ptr.
diff --git a/locale/programs/simple-hash.c b/locale/programs/simple-hash.c
index ef371a0..666e303 100644
--- a/locale/programs/simple-hash.c
+++ b/locale/programs/simple-hash.c
@@ -27,11 +27,7 @@
 #include <stdint.h>
 #include <sys/types.h>
 
-#if HAVE_OBSTACK
-# include <obstack.h>
-#else
-# include "obstack.h"
-#endif
+#include <obstack.h>
 
 #ifdef HAVE_VALUES_H
 # include <values.h>