Changeset 22398 in vbox

Timestamp:

Aug 23, 2009 8:36:47 PM (15 years ago)

Author:

vboxsync

Message:

IPRT: Fix compiling on FreeBSD amd64. When compiling code for 32bit our declerations for uint64_t and int64_t clash with the ones from FreeBSD. The ones from FreeBSD are actually wrong (guess they don't expect to compile 32bit software on 64bit) because they define uint64_t as 'unsigned long' whereas it needs to be 'unsigned long long' on 32bit. Before including sys/types.h we define them as declared to omit decleration in the system headers

File:

• trunk/include/iprt/types.h (modified) (1 diff)

trunk/include/iprt/types.h

@@ -95 +95 @@
 # 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