Changeset 6978 in vbox for trunk/include

Timestamp:

Feb 18, 2008 7:55:14 AM (17 years ago)

Author:

vboxsync

Message:

Additions/Linux: switch the VBOXGUEST_IOCTL_NR ioctl to VBOXGUEST_IOCTL_STRIP_SIZE

File:

• trunk/include/VBox/VBoxGuest.h (modified) (1 diff)

trunk/include/VBox/VBoxGuest.h

@@ -993 +993 @@
 # define VBOXGUEST_IOCTL_CODE(Function, Size)   _IOC(_IOC_READ|_IOC_WRITE, 'V', (Function) | VBOXGUEST_IOCTL_FLAG, (Size))
 # define VBOXGUEST_IOCTL_CODE_FAST(Function)    _IO(  'V', (Function) | VBOXGUEST_IOCTL_FLAG)
-# define VBOXGUEST_IOCTL_STRIP_SIZE(Function)   ((Function) - _IOC_SIZE((Function)))
-
-/** @todo r=bird: Please remove. See discussion in xTracker and elsewhere; VBOXGUEST_IOCTL_STRIP_SIZE is all we need here and it must be defined everywhere. */
-# define VBOXGUEST_IOCTL_NUMBER(Code)           (_IOC_NR((Code)) & ~VBOXGUEST_IOCTL_FLAG)
+# define VBOXGUEST_IOCTL_STRIP_SIZE(Code)       VBOXGUEST_IOCTL_CODE(_IOC_NR((Code)), 0)
 # define VBOXGUEST_IOCTL_SIZE(Code)             (_IOC_SIZE((Code)))