Changeset 13775 in vbox

Timestamp:

Nov 4, 2008 8:35:37 AM (16 years ago)

Author:

vboxsync

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

38756

Message:

EXPORT_SYMBOL after implementation of the function/variable; fixed warning

Location:

trunk

Files:

• include/iprt/param.h (modified) (1 diff)
• src/VBox/Runtime/common/alloc/heapsimple.cpp (modified) (3 diffs)

trunk/include/iprt/param.h

@@ -40 +40 @@
 
 /* Undefine PAGE_SIZE and PAGE_SHIFT to avoid unnecessary noice when clashing
-   with system headers. Include system headers before / after iprt depending
-   on which you wish to take precedence. */
+ * with system headers. Include system headers before / after iprt depending
+ * on which you wish to take precedence. */
 #undef PAGE_SIZE
 #undef PAGE_SHIFT
+
+/* Undefine PAGE_OFFSET_MASK to avoid the conflict with the-linux-kernel.h */
+#undef PAGE_OFFSET_MASK
 
 /**

trunk/src/VBox/Runtime/common/alloc/heapsimple.cpp

@@ -34 +34 @@
 *******************************************************************************/
 #define LOG_GROUP RTLOGGROUP_DEFAULT
+
+#if defined(IN_GUEST_R0) && defined(RT_OS_LINUX) && defined(IN_MODULE)
+/* should come first to prevent warnings about duplicate definitions of PAGE_* */
+# include "the-linux-kernel.h"
+#endif
+
 #include <iprt/heap.h>
 #include <iprt/assert.h>
@@ -44 +50 @@
 #include "internal/magics.h"
 
-#if defined(IN_GUEST_R0) && defined(RT_OS_LINUX) && defined(IN_MODULE)
-#include "the-linux-kernel.h"
-EXPORT_SYMBOL(RTHeapSimpleAlloc);
-EXPORT_SYMBOL(RTHeapSimpleInit);
-EXPORT_SYMBOL(RTHeapSimpleFree);
-#endif
 
 /*******************************************************************************
@@ -939 +939 @@
 }
 
+
+#if defined(IN_GUEST_R0) && defined(RT_OS_LINUX) && defined(IN_MODULE)
+EXPORT_SYMBOL(RTHeapSimpleAlloc);
+EXPORT_SYMBOL(RTHeapSimpleInit);
+EXPORT_SYMBOL(RTHeapSimpleFree);
+#endif