Changeset 35525 in vbox

Timestamp:

Jan 13, 2011 2:00:37 PM (14 years ago)

Author:

vboxsync

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

69409

Message:

Followup to r69260: Need the size_t redefinition, so include xf86_ansic.h from iprt/types.h.

Location:

trunk

Files:

trunk/include/iprt/types.h

-              r35514
+              r35525
 #ifndef IPRT_NO_CRT
+# if defined(RT_OS_DARWIN) && defined(KERNEL)
+# if defined(IN_XF86_MODULE) && !defined(NO_ANSIC)
+    /*
+     * Kludge for xfree86 modules: size_t and other types are redefined.
+     */
+RT_C_DECLS_BEGIN
+#  include "xf86_ansic.h"
+RT_C_DECLS_END
+# elif defined(RT_OS_DARWIN) && defined(KERNEL)
     /*
      * Kludge for the darwin kernel:
 …
 #ifdef RT_COMPILER_GROKS_64BIT_BITFIELDS
     /** Format using 64-bit bitfields.  */
     RT_GCC_EXTENSION struct
+    RT_GCC_EXTENSION struct
+    {
 # ifdef RT_BIG_ENDIAN

-              r35398
+              r35525
 *******************************************************************************/
 #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"
 …
 #include <iprt/log.h>
 #include <iprt/param.h>
+#include <iprt/string.h>
 #include "internal/magics.h"

-              r35398
+              r35525
 *******************************************************************************/
 #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"
 …
 #include <iprt/err.h>
 #include <iprt/log.h>
+#include <iprt/string.h>
 #include <iprt/param.h>

Note: See TracChangeset for help on using the changeset viewer.