about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWill Newton <will.newton@linaro.org>2014-03-17 10:54:12 +0000
committerWill Newton <will.newton@linaro.org>2014-03-17 16:05:23 +0000
commitf7efd7c3dfffa3c417e9d3c4cb19d9954a3b1421 (patch)
tree6b5198c45416fe41c22d8dc393c20326013ebe68
parent53f1bed39263541ef7f3d86f9701005524938016 (diff)
downloadglibc-f7efd7c3dfffa3c417e9d3c4cb19d9954a3b1421.tar.gz
glibc-f7efd7c3dfffa3c417e9d3c4cb19d9954a3b1421.tar.xz
glibc-f7efd7c3dfffa3c417e9d3c4cb19d9954a3b1421.zip
Fix _IO_JUMPS_OFFSET -Wundef warnings
ChangeLog:

2014-03-17  Will Newton  <will.newton@linaro.org>

	* libio/genops.c: Check whether
	_IO_JUMPS_OFFSET is defined with #ifdef rather
	than #if.
	* libio/libioP.h: Likewise.
	* stdio-common/vfprintf.c: Likewise.
-rw-r--r--ChangeLog6
-rw-r--r--libio/genops.c2
-rw-r--r--libio/libioP.h2
-rw-r--r--stdio-common/vfprintf.c2
4 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index af65c1dd25..4b33175657 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2014-03-17  Will Newton  <will.newton@linaro.org>
 
+	* libio/genops.c: Check whether
+	_IO_JUMPS_OFFSET is defined with #ifdef rather
+	than #if.
+	* libio/libioP.h: Likewise.
+	* stdio-common/vfprintf.c: Likewise.
+
 	* sysdeps/generic/ldsodefs.h: Check whether
 	HP_SMALL_TIMING_AVAIL is defined with #ifdef rather
 	than #if.
diff --git a/libio/genops.c b/libio/genops.c
index e0ce8cc0f4..42efe58ea1 100644
--- a/libio/genops.c
+++ b/libio/genops.c
@@ -624,7 +624,7 @@ _IO_old_init (fp, flags)
   fp->_IO_save_end = NULL;
   fp->_markers = NULL;
   fp->_cur_column = 0;
-#if _IO_JUMPS_OFFSET
+#ifdef _IO_JUMPS_OFFSET
   fp->_vtable_offset = 0;
 #endif
 #ifdef _IO_MTSAFE_IO
diff --git a/libio/libioP.h b/libio/libioP.h
index 8a7b85beb0..a59e95d89c 100644
--- a/libio/libioP.h
+++ b/libio/libioP.h
@@ -106,7 +106,7 @@ extern "C" {
 #define _IO_WIDE_JUMPS(THIS) ((struct _IO_FILE *) (THIS))->_wide_data->_wide_vtable
 #define _IO_CHECK_WIDE(THIS) (((struct _IO_FILE *) (THIS))->_wide_data != NULL)
 
-#if _IO_JUMPS_OFFSET
+#ifdef _IO_JUMPS_OFFSET
 # define _IO_JUMPS_FUNC(THIS) \
  (*(struct _IO_jump_t **) ((void *) &_IO_JUMPS ((struct _IO_FILE_plus *) (THIS)) \
 			   + (THIS)->_vtable_offset))
diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index f7e5f61cc8..70cdba40e5 100644
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -2297,7 +2297,7 @@ buffered_vfprintf (_IO_FILE *s, const CHAR_T *format,
   hp->_mode = -1;
 #endif
   hp->_IO_file_flags = _IO_MAGIC|_IO_NO_READS|_IO_USER_LOCK;
-#if _IO_JUMPS_OFFSET
+#ifdef _IO_JUMPS_OFFSET
   hp->_vtable_offset = 0;
 #endif
 #ifdef _IO_MTSAFE_IO