Revert "Fix _IO_JUMPS_OFFSET -Wundef warnings"

This reverts commit f7efd7c3dfffa3c417e9d3c4cb19d9954a3b1421.

diff --git a/ChangeLog b/ChangeLog
index 972c30b..a679274 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2014-03-17  Will Newton  <will.newton@linaro.org>
 
+       * libio/genops.c: Revert previous change.
+       * libio/libioP.h: Likewise.
+       * stdio-common/vfprintf.c: Likewise.
+
        * sysdeps/generic/math_private.h: Revert previous
        change.
 

diff --git a/libio/genops.c b/libio/genops.c
index 42efe58..e0ce8cc 100644 (file)
--- 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;
-#ifdef _IO_JUMPS_OFFSET
+#if _IO_JUMPS_OFFSET
   fp->_vtable_offset = 0;
 #endif
 #ifdef _IO_MTSAFE_IO

diff --git a/libio/libioP.h b/libio/libioP.h
index a59e95d..8a7b85b 100644 (file)
--- 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)
 
-#ifdef _IO_JUMPS_OFFSET
+#if _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 70cdba4..f7e5f61 100644 (file)
--- 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;
-#ifdef _IO_JUMPS_OFFSET
+#if _IO_JUMPS_OFFSET
   hp->_vtable_offset = 0;
 #endif
 #ifdef _IO_MTSAFE_IO