The Change r232264 [0] on FreeBSD 10-CURRENT caused build failures
in VirtualBox. Attached patch uses the _UINTPTR_T_DECLARED defines
to signal this.
The patch is licensed under MIT License as usual.
Author: Tijl Coosemans <[email protected]>
Reference: http://svn.freebsd.org/changeset/base/232264
kBuild: Compiling tstVMStructRC -
/usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.1.8_OSE/src/VBox/VMM/testcase/tstVMStructRC.cpp
In file included from /usr/include/sys/types.h:63,
from
/usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.1.8_OSE/include/iprt/types.h:85,
from
/usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.1.8_OSE/include/VBox/types.h:30,
from
/usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.1.8_OSE/src/VBox/VMM/testcase/tstVMStructRC.cpp:33:
/usr/include/sys/_stdint.h:74: error: conflicting declaration
'typedef
__intptr_t intptr_t'
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
/usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.1.8_OSE/include/iprt/stdint.h:162:
error: 'intptr_t' has a previous declaration as 'typedef long int
intptr_t'
/usr/include/sys/_stdint.h:78: error: conflicting declaration
'typedef
__uintptr_t uintptr_t'
/usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.1.8_OSE/include/iprt/stdint.h:165:
error: 'uintptr_t' has a previous declaration as 'typedef long
unsigned
int uintptr_t'
kBuild: Compiling tstAsmStructsasm -
/usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.1.8_OSE/src/VBox/VMM/testcase/tstAsmStructsAsm.asm
kBuild: Compiling tstGlobalConfig -
/usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.1.8_OSE/src/VBox/VMM/testcase/tstGlobalConfig.cpp
kmk: ***
[/usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.1.8_OSE/out/freebsd.amd64/release/obj/tstVMStructRC/tstVMStructRC.o]
Error 1
The failing command:
@c++ -m32 -c -O2 -g -pipe -pedantic -Wshadow -Wall -Wextra
Compiling with -m32 wasn't really supported (until now)...
-Wno-missing-field-initializers -Wno-unused -Wno-trigraphs
-fdiagnostics-show-option -Wno-long-long -Wno-variadic-macros
-fno-exceptions -O2 -mtune=generic -fno-omit-frame-pointer -mno-sse
-mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing
-fno-stack-protector
-fvisibility=hidden -DVBOX_HAVE_VISIBILITY_HIDDEN
-DRT_USE_VISIBILITY_DEFAULT -fvisibility-inlines-hidden -fno-rtti -O0
-I/usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.1.8_OSE/src/VBox/VMM/include
-I/usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.1.8_OSE/src/VBox/VMM/PATM
-I/usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.1.8_OSE/include
-I/usr/ports/emulators/virtualbox-ose/work/VirtualBox-4.1.8_OSE/out/freebsd.amd64/release
-DVBOX -DVBOX_WITH_DEBUGGER -DVBOX_OSE -DVBOX_WITH_64_BITS_GUESTS
-DVBOX_WITH_HARDENING
-DRTPATH_APP_PRIVATE=\"/usr/local/share/virtualbox-ose\"
-DRTPATH_APP_PRIVATE_ARCH=\"/usr/local/lib/virtualbox\"
-DRTPATH_SHARED_LIBS=\"/usr/local/lib/virtualbox\"
-DRTPATH_APP_DOCS=\"/usr/local/share/doc/virtualbox-ose\"
-DRT_OS_FREEBSD -D__FREEBSD__ -DRT_ARCH_X86 -D__X86__ -DIN_RC
-DHC_ARCH_BITS=64 -DGC_ARCH_BITS=64 -DIN_VMM_RC -DIN_DIS -DIN_RT_RC
-DVBOX_WITH_RAW_MODE -DIPRT_DONT_USE_SYSTEM_STDINT_H
--
Bernhard Fröhlich
http://www.bluelife.at/
--- include/iprt/types.h.orig 2012-03-05 10:48:48.000000000 +0100
+++ include/iprt/types.h 2012-03-05 11:21:25.000000000 +0100
@@ -82,6 +82,8 @@
# include <stddef.h>
# define _UINT64_T_DECLARED
# define _INT64_T_DECLARED
+# define _UINTPTR_T_DECLARED
+# define _INTPTR_T_DECLARED
# include <sys/types.h>
# elif defined(RT_OS_LINUX) && defined(__KERNEL__)
_______________________________________________
vbox-dev mailing list
[email protected]
https://www.virtualbox.org/mailman/listinfo/vbox-dev
