summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authortom <tom@a5019735-40e9-0310-863c-91ae7b9d1cf9>2011-08-13 15:14:58 +0000
committertom <tom@a5019735-40e9-0310-863c-91ae7b9d1cf9>2011-08-13 15:14:58 +0000
commit5ad3d560147b912357d5a32193a34f6396e845e6 (patch)
tree4bb684845dea7be18a59190e916393fa537bc7b6 /include
parent4b03d390a5e185efda5ca79eddf4016a85624048 (diff)
Fix VKI_FIOQSIZE definition on ppc platforms.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11973 a5019735-40e9-0310-863c-91ae7b9d1cf9
Diffstat (limited to 'include')
-rw-r--r--include/vki/vki-ppc32-linux.h8
-rw-r--r--include/vki/vki-ppc64-linux.h7
2 files changed, 2 insertions, 13 deletions
diff --git a/include/vki/vki-ppc32-linux.h b/include/vki/vki-ppc32-linux.h
index 7ab8ff77..abf85159 100644
--- 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)
@@ -638,12 +638,6 @@ struct vki_termios {
#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 f813c34f..fdccc567 100644
--- 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