Made sure that C++ compilers do not complain about the _VKI_IOC_TYPECHECK() macro.

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

diff --git a/include/vki/vki-ppc32-linux.h b/include/vki/vki-ppc32-linux.h
index 69932c04cab43ea7e03f2cecbeb941666e6f3d3a..f39d9100dbca2326b4984ac35d0313579ffc8bc8 100644 (file)
--- a/include/vki/vki-ppc32-linux.h
+++ b/include/vki/vki-ppc32-linux.h
@@ -516,11 +516,9 @@ struct vki_termios {
          ((size) << _VKI_IOC_SIZESHIFT))
 
 /* provoke compile error for invalid uses of size argument */
-extern unsigned int __VKI_invalid_size_argument_for_IOC;
 #define _VKI_IOC_TYPECHECK(t) \
-        ((sizeof(t) == sizeof(t[1]) && \
-          sizeof(t) < (1 << _VKI_IOC_SIZEBITS)) ? \
-          sizeof(t) : __VKI_invalid_size_argument_for_IOC)
+        (sizeof(t) / (sizeof(t) == sizeof(t[1]) && \
+          sizeof(t) < (1 << _VKI_IOC_SIZEBITS)))
 
 /* used to create numbers */
 #define _VKI_IO(type,nr)                       _VKI_IOC(_VKI_IOC_NONE,(type),(nr),0)

diff --git a/include/vki/vki-ppc64-linux.h b/include/vki/vki-ppc64-linux.h
index 610a16361708bd0f3ad065e89f3480c09cdc9f16..1a8df320a6c8f0a9afbff80adc3b7ba1c8e9ff6c 100644 (file)
--- a/include/vki/vki-ppc64-linux.h
+++ b/include/vki/vki-ppc64-linux.h
@@ -559,11 +559,9 @@ struct vki_termios {
          ((size) << _VKI_IOC_SIZESHIFT))
 
 /* provoke compile error for invalid uses of size argument */
-extern unsigned int __invalid_size_argument_for_IOC;
 #define _VKI_IOC_TYPECHECK(t) \
-       ((sizeof(t) == sizeof(t[1]) && \
-         sizeof(t) < (1 << _VKI_IOC_SIZEBITS)) ? \
-         sizeof(t) : __invalid_size_argument_for_IOC)
+       (sizeof(t) / (sizeof(t) == sizeof(t[1]) && \
+         sizeof(t) < (1 << _VKI_IOC_SIZEBITS)))
 
 /* used to create numbers */
 #define _VKI_IO(type,nr)            _VKI_IOC(_VKI_IOC_NONE,(type),(nr),0)

diff --git a/include/vki/vki-x86-linux.h b/include/vki/vki-x86-linux.h
index 08aed502f6fee44f1150c9239a0630497355a9df..6f9246fca6db02968013f8c4473ecc274fbc7018 100644 (file)
--- a/include/vki/vki-x86-linux.h
+++ b/include/vki/vki-x86-linux.h
@@ -480,11 +480,9 @@ struct vki_termios {
         ((size) << _VKI_IOC_SIZESHIFT))
 
 /* provoke compile error for invalid uses of size argument */
-extern unsigned int __vki_invalid_size_argument_for_IOC;
 #define _VKI_IOC_TYPECHECK(t) \
-       ((sizeof(t) == sizeof(t[1]) && \
-         sizeof(t) < (1 << _VKI_IOC_SIZEBITS)) ? \
-         sizeof(t) : __vki_invalid_size_argument_for_IOC)
+       (sizeof(t) / (sizeof(t) == sizeof(t[1]) && \
+         sizeof(t) < (1 << _VKI_IOC_SIZEBITS)))
 
 /* used to create numbers */
 #define _VKI_IO(type,nr)       _VKI_IOC(_VKI_IOC_NONE,(type),(nr),0)