Changeset 31409 in vbox for trunk/src/VBox/Additions/common/VBoxGuestLib

Timestamp:

Aug 5, 2010 1:47:41 PM (15 years ago)

Author:

vboxsync

Message:

Additions/XFree86/vboxvideo: eliminate some problematic symbols

Location:

trunk/src/VBox/Additions/common/VBoxGuestLib

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxGuestR3LibGuestProp.cpp (modified) (1 diff)
• VBoxGuestR3LibVideo.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk

@@ -152 +152 @@
         RTMEM_NO_WRAP_TO_EF_APIS \
         $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS,)
+VBoxGuestR3LibXFree86_CXXFLAGS.linux = \
+    $(VBOX_GCC_fno-stack-protector) -ffreestanding
 VBoxGuestR3LibXFree86_SOURCES  = \
         VBoxGuestR3Lib.cpp \

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp

@@ -30 +30 @@
 *******************************************************************************/
 #include <iprt/string.h>
-#include <iprt/mem.h>
+#ifndef VBOX_VBGLR3_XFREE86
+# include <iprt/mem.h>
+#endif
 #include <iprt/assert.h>
-#include <iprt/cpp/autores.h>
 #include <iprt/stdarg.h>
 #include <VBox/log.h>

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp

@@ -30 +30 @@
 *******************************************************************************/
 #include <iprt/assert.h>
-#include <iprt/mem.h>
+#ifndef VBOX_VBGLR3_XFREE86
+# include <iprt/mem.h>
+#endif
 #include <iprt/string.h>
 #include <VBox/log.h>
@@ -43 +45 @@
 # undef memcpy
 # define memcpy xf86memcpy
+extern "C" void* xf86memset(const void*,int,xf86size_t);
+# undef memset
+# define memset xf86memset
 #endif /* VBOX_VBGLR3_XFREE86 */