From: Bart Van Assche <bvanassche@acm.org>
Date: Tue, 29 Dec 2009 15:08:14 +0000 (+0000)
Subject: Made sure that C++ compilers do not complain about the _VKI_IOC_TYPECHECK() macro.
X-Git-Tag: svn/VALGRIND_3_6_0~446
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30b6cbe31851e0ab3186a04d81b74a428815a934;p=thirdparty%2Fvalgrind.git

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 69932c04ca..f39d9100db 100644
--- 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 610a163617..1a8df320a6 100644
--- 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 08aed502f6..6f9246fca6 100644
--- 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)