Changeset 21266 in vbox for trunk/src/VBox/Runtime/r0drv/linux

Timestamp:

Jul 6, 2009 6:32:32 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

49603

Message:

the-linux-kernel.h: fixed PAGE_SIZE warnings.

File:

• trunk/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h (modified) (2 diffs)

trunk/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h

@@ -266 +266 @@
 #endif
 
-#ifndef PAGE_OFFSET_MASK
-# define PAGE_OFFSET_MASK (PAGE_SIZE - 1)
-#endif
-
 /** @def ONE_MSEC_IN_JIFFIES
  * The number of jiffies that make up 1 millisecond. Must be at least 1! */
@@ -305 +301 @@
 #endif
 
-#endif
-
+/*
+ * There are some conflicting defines in iprt/param.h, sort them out here.
+ */
+#ifndef ___iprt_param_h
+# undef PAGE_SIZE
+# undef PAGE_OFFSET_MASK
+# include <iprt/param.h>
+#endif
+
+#endif
+