about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSiddhesh Poyarekar <siddhesh@redhat.com>2014-07-10 14:18:13 +0530
committerSiddhesh Poyarekar <siddhesh@redhat.com>2014-07-10 14:18:13 +0530
commitc3c7c3604fdf934d7a8ec70d79915cd8c8984ad1 (patch)
treeb8a8abb7d415b3fa00ade5bdacfefffc2c9cf601
parentd62aa75af1941fca6f07e107afc447b7b248e340 (diff)
downloadglibc-c3c7c3604fdf934d7a8ec70d79915cd8c8984ad1.tar.gz
glibc-c3c7c3604fdf934d7a8ec70d79915cd8c8984ad1.tar.xz
glibc-c3c7c3604fdf934d7a8ec70d79915cd8c8984ad1.zip
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.
-rw-r--r--ChangeLog2
-rw-r--r--locale/programs/simple-hash.c6
2 files changed, 3 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 72e9cf9e28..dc0b76c236 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 ef371a080c..666e303eb4 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>