Changeset 35398 in vbox for trunk/src/VBox/Runtime

Timestamp:

Jan 4, 2011 9:39:07 AM (14 years ago)

Author:

vboxsync

Message:

re-applied r69255, r69257: properly wrap mem* to xf86mem* for older XF86 modules

Location:

trunk/src/VBox/Runtime/common/alloc

Files:

• heapoffset.cpp (modified) (2 diffs)
• heapsimple.cpp (modified) (2 diffs)

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

@@ -30 +30 @@
 *******************************************************************************/
 #define LOG_GROUP RTLOGGROUP_DEFAULT
+/* XXX this header must be included first as it re-defines some symbols
+ * (e.g size_t) if IN_XF86_MODULE is defined. */
+#include <iprt/string.h>
 #include <iprt/heap.h>
 #include "internal/iprt.h"
@@ -35 +38 @@
 #include <iprt/assert.h>
 #include <iprt/asm.h>
-#include <iprt/string.h>
 #include <iprt/err.h>
 #include <iprt/log.h>

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

@@ -30 +30 @@
 *******************************************************************************/
 #define LOG_GROUP RTLOGGROUP_DEFAULT
+/* XXX this header must be included first as it re-defines some symbols
+ * (e.g size_t) if IN_XF86_MODULE is defined. */
+#include <iprt/string.h>
 #include <iprt/heap.h>
 #include "internal/iprt.h"
@@ -35 +38 @@
 #include <iprt/assert.h>
 #include <iprt/asm.h>
-#include <iprt/string.h>
 #include <iprt/err.h>
 #include <iprt/log.h>