about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2014-05-01 13:33:13 -0700
committerRoland McGrath <roland@hack.frob.com>2014-05-01 13:33:13 -0700
commit8f2f08d04f969f27dad47ee2d9dcbe567f2873bc (patch)
tree39e417a6aefb6c949b792f30019de2cf6d1acaec
parentc727f0325376e202d095be718daf64661409e499 (diff)
downloadglibc-8f2f08d04f969f27dad47ee2d9dcbe567f2873bc.tar.gz
glibc-8f2f08d04f969f27dad47ee2d9dcbe567f2873bc.tar.xz
glibc-8f2f08d04f969f27dad47ee2d9dcbe567f2873bc.zip
Fix -Wundef warnings for _IO_JUMPS_OFFSET.
-rw-r--r--ChangeLog3
-rw-r--r--libio/libioP.h2
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2539d1e893..dd8244c4a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2014-05-01  Roland McGrath  <roland@hack.frob.com>
 
+	* libio/libioP.h [!_IO_USE_OLD_IO_FILE && !_G_IO_NO_BACKWARD_COMPAT]
+	(_IO_JUMPS_OFFSET): Define to 0.
+
 	* nptl/sysdeps/pthread/bits/libc-lock.h
 	[_LIBC && (!NOT_IN_libc || IS_IN_libpthread)]
 	(__libc_lock_define_initialized_recursive): Always define using
diff --git a/libio/libioP.h b/libio/libioP.h
index 8a7b85beb0..bd94041937 100644
--- a/libio/libioP.h
+++ b/libio/libioP.h
@@ -100,6 +100,8 @@ extern "C" {
 #if (!defined _IO_USE_OLD_IO_FILE \
      && (!defined _G_IO_NO_BACKWARD_COMPAT || _G_IO_NO_BACKWARD_COMPAT == 0))
 # define _IO_JUMPS_OFFSET 1
+#else
+# define _IO_JUMPS_OFFSET 0
 #endif
 
 #define _IO_JUMPS(THIS) (THIS)->vtable