Changeset 5893 in vbox for trunk/src/VBox/Additions/linux/module

Timestamp:

Nov 30, 2007 2:21:05 PM (17 years ago)

Author:

vboxsync

Message:

Guest Additions (Linux): replaced compiler_assert by AssertCompiler in the kernel module

Location:

trunk/src/VBox/Additions/linux/module

Files:

• hgcmcall.c (modified) (2 diffs)
• vboxmod.c (modified) (2 diffs)
• vboxmod.h (modified) (1 diff)

trunk/src/VBox/Additions/linux/module/hgcmcall.c

@@ -24 +24 @@
 #include "vboxmod.h"
 #include "waitcompat.h"
+
 #include <VBox/log.h>
+#include <iprt/assert.h>
 
 
@@ -290 +292 @@
     int rc;
 
-    compiler_assert(_IOC_SIZE(IOCTL_VBOXGUEST_HGCM_CALL) == sizeof(VBoxGuestHGCMCallInfo));
+    AssertCompiler((_IOC_SIZE(IOCTL_VBOXGUEST_HGCM_CALL) == sizeof(VBoxGuestHGCMCallInfo)));
     /* Get the call header from user space to see how many call parameters there are. */
     if (copy_from_user(&callHeader, (void*)arg, sizeof(callHeader)))

trunk/src/VBox/Additions/linux/module/vboxmod.c

@@ -23 +23 @@
 #include "vboxmod.h"
 #include "waitcompat.h"
+
 #include <VBox/log.h>
 #include <iprt/asm.h>
@@ -372 +373 @@
             int rc;
 
-            compiler_assert(sizeof(VMMDevRequestHeader) == _IOC_SIZE(IOCTL_VBOXGUEST_VMMREQUEST));
+            AssertCompiler((sizeof(VMMDevRequestHeader) == _IOC_SIZE(IOCTL_VBOXGUEST_VMMREQUEST)));
             if (copy_from_user(&reqHeader, (void*)arg, _IOC_SIZE(cmd)))
             {

trunk/src/VBox/Additions/linux/module/vboxmod.h

@@ -67 +67 @@
 if (n >= vboxadd_verbosity) printk (KERN_DEBUG "vboxadd: " __VA_ARGS__)
 
-#define compiler_assert(val) \
-do { \
-switch(0) { \
-case 0: \
-case (val): \
-default: \
-break; \
-} \
-} while(0);
-
 extern int vboxadd_cmc_init (void);
 extern void vboxadd_cmc_fini (void);