Changeset 11551 in vbox for trunk/src/VBox/Main

Timestamp:

Aug 21, 2008 5:16:02 PM (16 years ago)

Author:

vboxsync

Message:

API/xpcom: prefix any C symbols in VBoxXPCOM.so, to avoid namespace pollution. Enabled only on Linux at the moment.

Location:

trunk/src/VBox/Main/testcase

Files:

• Makefile.kmk (modified) (1 diff)
• makefile.tstVBoxAPILinux (modified) (3 diffs)

trunk/src/VBox/Main/testcase/Makefile.kmk

@@ -86 +86 @@
 tstVBoxAPILinux_CXXFLAGS = -Wno-non-virtual-dtor -fshort-wchar
 tstVBoxAPILinux_LDFLAGS.solaris += '$(VBOX_GCC_RPATH_OPT)$$(VBOX_ORIGIN)/../../..'
+ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+ tstVBoxAPILinux_DEFS += VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+endif
 tstVBoxAPILinux_INCS     = \
         $(VBOX_XPCOM_INCS) \

trunk/src/VBox/Main/testcase/makefile.tstVBoxAPILinux

@@ -21 +21 @@
 PATH_BIN       = ../../..
 
+# This setting must be the same as used when building VBoxXPCOM.so.
+# If you get a lot of unresolved symbols, try commenting it out.
+VBOX_WITH_XPCOM_NAMESPACE_CLEANUP=1
+
 PATH_XPCOM_IDL = $(PATH_XPCOM)/idl
 INCS_XPCOM     = $(PATH_XPCOM)/include \
@@ -27 +31 @@
                  $(PATH_XPCOM)/include/xpcom/xpcom \
                  $(PATH_XPCOM)/include/xpcom/ipcd
+
+ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+ DEFS_XPCOM   += VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+endif
+
 
 #
@@ -38 +47 @@
 
 tstVBoxAPILinux.o: tstVBoxAPILinux.cpp
-        g++ -c -DRT_OS_LINUX -g -fshort-wchar $(addprefix -I, $(INCS_XPCOM)) -o $@ tstVBoxAPILinux.cpp
+        g++ -c -DRT_OS_LINUX -g -fshort-wchar $(addprefix -I, $(INCS_XPCOM)) $(addprefix -D, $(DEFS_XPCOM)) -o $@ tstVBoxAPILinux.cpp
 
 clean: