Changeset 31409 in vbox

Timestamp:

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

Author:

vboxsync

Message:

Additions/XFree86/vboxvideo: eliminate some problematic symbols

Location:

trunk/src/VBox/Additions

Files:

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

r31364	r31409
152	152	RTMEM_NO_WRAP_TO_EF_APIS \
153	153	$(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS,)
	154	VBoxGuestR3LibXFree86_CXXFLAGS.linux = \
	155	$(VBOX_GCC_fno-stack-protector) -ffreestanding
154	156	VBoxGuestR3LibXFree86_SOURCES = \
155	157	VBoxGuestR3Lib.cpp \

-              r31386
+              r31409
 *******************************************************************************/
 #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>

-              r31384
+              r31409
 *******************************************************************************/
 #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>
 …
 # undef memcpy
 # define memcpy xf86memcpy
+extern "C" void* xf86memset(const void*,int,xf86size_t);
+# undef memset
+# define memset xf86memset
 #endif /* VBOX_VBGLR3_XFREE86 */

-              r31391
+              r31409
         IN_MODULE XFree86Module
  vboxvideo_drv_CFLAGS.linux := \
+        -Wno-conversion -Wno-unused-parameter $(VBOX_GCC_Wno-variadic-macros)
+        -Wno-conversion -Wno-unused-parameter $(VBOX_GCC_Wno-variadic-macros) \
+        $(VBOX_GCC_fno-stack-protector) -ffreestanding
  vboxvideo_drv_INCS = \
         $(VBOX_PATH_X11_XFREE_4_3)/include \

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