From: Roland McGrath <roland@hack.frob.com>
Date: Thu, 1 May 2014 20:33:13 +0000 (-0700)
Subject: Fix -Wundef warnings for _IO_JUMPS_OFFSET.
X-Git-Tag: glibc-2.20~557
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f2f08d04f969f27dad47ee2d9dcbe567f2873bc;p=thirdparty%2Fglibc.git

Fix -Wundef warnings for _IO_JUMPS_OFFSET.
---

diff --git a/ChangeLog b/ChangeLog
index 2539d1e893d..dd8244c4a35 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 8a7b85beb0f..bd94041937f 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