Changeset 22457 in vbox

Timestamp:

Aug 26, 2009 8:49:15 AM (15 years ago)

Author:

vboxsync

Message:

iprt/types.h: Keep hacks out of the default case.

File:

• trunk/include/iprt/types.h (modified) (3 diffs)

trunk/include/iprt/types.h

@@ -67 +67 @@
 #   error "offsetof is not defined..."
 #  endif
+
+# elif defined(RT_OS_FREEBSD) && HC_ARCH_BITS == 64 && defined(RT_ARCH_X86)
+    /*
+     * Kludge for compiling 32-bit code on a 64-bit FreeBSD:
+     *  FreeBSD declares uint64_t and int64_t wrong (long unsigned and long int
+     *  though they need to be long long unsigned and long long int). These
+     *  defines conflict with our decleration in stdint.h. Adding the defines
+     *  below omits the definitions in the system header.
+     */
+#  include <stddef.h>
+#  define _UINT64_T_DECLARED
+#  define _INT64_T_DECLARED
+#  include <sys/types.h>
 
 # elif defined(RT_OS_LINUX) && defined(__KERNEL__)
@@ -95 +108 @@
 # else
 #  include <stddef.h>
-#   if defined(RT_OS_FREEBSD) && (HC_ARCH_BITS == 64) && defined(RT_ARCH_X86)
-     /* Compiling on a 64bit machine in 32bit mode. FreeBSD declares
-      * uint64_t and int64_t wrong (long unsigned and long int
-      * though they need to be long long unsigned and long long int)
-      *
-      * These defines conflict with our decleration in stdint.h.
-      * Adding the defines below omits the definitions in the system header.
-      */
-#    define _UINT64_T_DECLARED
-#    define _INT64_T_DECLARED
-#   endif
 #  include <sys/types.h>
 # endif
@@ -115 +117 @@
 # endif
 
-#else /* no crt */
+#else  /* no crt */
 # include <iprt/nocrt/compiler/compiler.h>
 #endif /* no crt */