Fix VKI_FIOQSIZE definition on ppc platforms.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11973

diff --git a/include/vki/vki-ppc32-linux.h b/include/vki/vki-ppc32-linux.h
index 7ab8ff7713a685f61c6600434361080ccd5a70a5..abf85159111ae74d6fadac89fa43741a652d58e7 100644 (file)
--- a/include/vki/vki-ppc32-linux.h
+++ b/include/vki/vki-ppc32-linux.h
@@ -543,7 +543,7 @@ struct vki_termios {
 #define VKI_FIONBIO            _VKI_IOW('f', 126, int)
 #define VKI_FIONREAD           _VKI_IOR('f', 127, int)
 //#define VKI_TIOCINQ          VKI_FIONREAD
-//#define VKI_FIOQSIZE         _VKI_IOR('f', 128, vki_loff_t)
+#define VKI_FIOQSIZE           _VKI_IOR('f', 128, vki_loff_t)
 
 //#define VKI_TIOCGETP         _VKI_IOR('t', 8, struct vki_sgttyb)
 //#define VKI_TIOCSETP         _VKI_IOW('t', 9, struct vki_sgttyb)
@@ -637,12 +637,6 @@ struct vki_termios {
 //#define VKI_TIOCMIWAIT       0x545C  /* wait for a change on serial input line(s) */
 #define VKI_TIOCGICOUNT                0x545D  /* read serial port inline interrupt counts */
 
-//----------------------------------------------------------------------
-// From linux-2.6.39-rc2/arch/powerpc/include/asm/ioctls.h
-//----------------------------------------------------------------------
-
-#define VKI_FIOQSIZE    VKI_IOR('f', 128, vki_loff_t)
-
 //----------------------------------------------------------------------
 // From linux-2.6.9/include/asm-ppc/poll.h
 //----------------------------------------------------------------------

diff --git a/include/vki/vki-ppc64-linux.h b/include/vki/vki-ppc64-linux.h
index f813c34f8f7841df8915cd110cc3c7f14c72bf5b..fdccc5676b7e29e8c135ff98ae783569bca829c6 100644 (file)
--- a/include/vki/vki-ppc64-linux.h
+++ b/include/vki/vki-ppc64-linux.h
@@ -620,12 +620,7 @@ struct vki_termios {
 #define VKI_FIOASYNC        _VKI_IOW('f', 125, int)
 #define VKI_TIOCSERGETLSR   0x5459 /* Get line status register */
 #define VKI_TIOCGICOUNT            0x545D /* read serial port inline interrupt counts */
-
-//----------------------------------------------------------------------
-// From linux-2.6.39-rc2/arch/powerpc/include/asm/ioctls.h
-//----------------------------------------------------------------------
-
-#define VKI_FIOQSIZE    VKI_IOR('f', 128, vki_loff_t)
+#define VKI_FIOQSIZE        _VKI_IOR('f', 128, vki_loff_t)
 
 //----------------------------------------------------------------------
 // From linux-2.6.13/include/asm-ppc64/poll.h