Changeset 11551 in vbox for trunk/src/libs

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

35134

Message:

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

Location:

trunk/src/libs/xpcom18a4

Files:

• Makefile.kmk (modified) (3 diffs)
• nsprpub/lib/ds/plarenas.h (modified) (1 diff)
• nsprpub/lib/ds/plhash.h (modified) (1 diff)
• nsprpub/lib/libc/include/plbase64.h (modified) (1 diff)
• nsprpub/lib/libc/include/plerror.h (modified) (1 diff)
• nsprpub/lib/libc/include/plgetopt.h (modified) (1 diff)
• nsprpub/lib/libc/include/plstr.h (modified) (1 diff)
• nsprpub/pr/include/obsolete/pralarm.h (modified) (1 diff)
• nsprpub/pr/include/obsolete/probslet.h (modified) (1 diff)
• nsprpub/pr/include/obsolete/prsem.h (modified) (1 diff)
• nsprpub/pr/include/pratom.h (modified) (1 diff)
• nsprpub/pr/include/prbit.h (modified) (1 diff)
• nsprpub/pr/include/prcmon.h (modified) (1 diff)
• nsprpub/pr/include/prcountr.h (modified) (1 diff)
• nsprpub/pr/include/prcvar.h (modified) (1 diff)
• nsprpub/pr/include/prdtoa.h (modified) (1 diff)
• nsprpub/pr/include/prenv.h (modified) (1 diff)
• nsprpub/pr/include/prerror.h (modified) (1 diff)
• nsprpub/pr/include/prinit.h (modified) (1 diff)
• nsprpub/pr/include/prinrval.h (modified) (1 diff)
• nsprpub/pr/include/prio.h (modified) (1 diff)
• nsprpub/pr/include/pripcsem.h (modified) (1 diff)
• nsprpub/pr/include/private/pprio.h (modified) (1 diff)
• nsprpub/pr/include/private/pprthred.h (modified) (1 diff)
• nsprpub/pr/include/private/primpl.h (modified) (1 diff)
• nsprpub/pr/include/prlink.h (modified) (1 diff)
• nsprpub/pr/include/prlock.h (modified) (1 diff)
• nsprpub/pr/include/prlog.h (modified) (1 diff)
• nsprpub/pr/include/prlong.h (modified) (1 diff)
• nsprpub/pr/include/prmem.h (modified) (1 diff)
• nsprpub/pr/include/prmon.h (modified) (1 diff)
• nsprpub/pr/include/prmwait.h (modified) (1 diff)
• nsprpub/pr/include/prnetdb.h (modified) (1 diff)
• nsprpub/pr/include/prolock.h (modified) (1 diff)
• nsprpub/pr/include/prpdce.h (modified) (1 diff)
• nsprpub/pr/include/prprf.h (modified) (1 diff)
• nsprpub/pr/include/prproces.h (modified) (1 diff)
• nsprpub/pr/include/prrng.h (modified) (1 diff)
• nsprpub/pr/include/prrwlock.h (modified) (1 diff)
• nsprpub/pr/include/prshm.h (modified) (1 diff)
• nsprpub/pr/include/prshma.h (modified) (1 diff)
• nsprpub/pr/include/prsystem.h (modified) (1 diff)
• nsprpub/pr/include/prthread.h (modified) (1 diff)
• nsprpub/pr/include/prtime.h (modified) (1 diff)
• nsprpub/pr/include/prtpool.h (modified) (1 diff)
• nsprpub/pr/include/prtrace.h (modified) (1 diff)
• nsprpub/pr/src/linking/prlink.c (modified) (1 diff)
• nsprpub/pr/src/malloc/prmem.c (modified) (1 diff)
• xpcom-namespace-cleanup.map (added)
• xpcom/base/nsTraceRefcntImpl.h (modified) (1 diff)
• xpcom/build/nsXPCOM.h (modified) (1 diff)
• xpcom/build/nsXPCOMPrivate.h (modified) (1 diff)
• xpcom/ds/nsEnumeratorUtils.h (modified) (1 diff)
• xpcom/ds/nsIEnumerator.idl (modified) (1 diff)
• xpcom/ds/nsQuickSort.h (modified) (1 diff)
• xpcom/ds/pldhash.h (modified) (1 diff)
• xpcom/io/nsIStringStream.idl (modified) (1 diff)
• xpcom/reflect/xptcall/public/xptcall.h (modified) (1 diff)
• xpcom/reflect/xptinfo/public/xptinfo.h (modified) (1 diff)
• xpcom/string/public/nsStringAPI.h (modified) (1 diff)
• xpcom/threads/plevent.h (modified) (1 diff)
• xpcom/typelib/xpt/public/xpt_arena.h (modified) (1 diff)
• xpcom/typelib/xpt/public/xpt_struct.h (modified) (1 diff)
• xpcom/typelib/xpt/public/xpt_xdr.h (modified) (1 diff)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -27 +27 @@
 endif
 include $(KBUILD_PATH)/subheader.kmk
+
+# File for filtering out C symbols from the XPCOM library. Used to avoid
+# symbol namespace pollution, causing trouble with system libraries.
+XPCOM_C_NAMESPACE_MAP=$(VBOX_PATH_XPCOM_SRC)/xpcom-namespace-cleanup.map
+
+# @todo check whether VBoxXPCOMIPCC.so or VBoxXPCOMIPCD contain undefined
+# symbols starting with NS_, PL_, PR_ or XPT. Would move the test time failure
+# when missing a symbol renaming to a build time failure. Likewise, there
+# should be a check whether VBoxXPCOM.so contains global C symbols (at least
+# where the whitelisting of symbols via the map file is not used).
+
 
 ifdef VBOX_WITH_PYTHON
@@ -78 +89 @@
                                      XPCOM_DLL_BASE=\"$(basename $(notdir $(LIB_XPCOM)))\" \
                                      MOZ_DLL_SUFFIX=\"$(suffix $(LIB_XPCOM))\"
+ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+TEMPLATE_XPCOM_DEFS                               += VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+endif
 TEMPLATE_XPCOM_DEFS.x86            = i386=1
 TEMPLATE_XPCOM_DEFS.amd64          = HAVE_VA_LIST_AS_ARRAY HAVE_VA_COPY VA_COPY\(a\,b\)=__builtin_va_copy\(a\,b\)
@@ -1099 +1113 @@
 VBoxXPCOM_NAME = $(basename $(notdir $(LIB_XPCOM)))
 VBoxXPCOM_DEFS = BUILD_DCONNECT="1" _IMPL_NS_COM
+ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+VBoxXPCOM_LDFLAGS.linux     = -Wl,--version-script=$(XPCOM_C_NAMESPACE_MAP)
+VBoxXPCOM_DEPS.linux       += $(XPCOM_C_NAMESPACE_MAP)
+VBoxXPCOM_LDFLAGS.solaris   = -Wl,-M,$(XPCOM_C_NAMESPACE_MAP)
+VBoxXPCOM_DEPS.solaris     += $(XPCOM_C_NAMESPACE_MAP)
+endif
 VBoxXPCOM_SOURCES = \
         xpcom/build/nsXPComInit.cpp \

trunk/src/libs/xpcom18a4/nsprpub/lib/ds/plarenas.h

@@ -39 +39 @@
 #else  /* defined(PLARENAS_H) */
 #define PLARENAS_H
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PL_ArenaAllocate VBoxNsplPL_ArenaAllocate
+#define PL_ArenaFinish VBoxNsplPL_ArenaFinish
+#define PL_ArenaGrow VBoxNsplPL_ArenaGrow
+#define PL_ArenaRelease VBoxNsplPL_ArenaRelease
+#define PL_CompactArenaPool VBoxNsplPL_CompactArenaPool
+#define PL_FinishArenaPool VBoxNsplPL_FinishArenaPool
+#define PL_FreeArenaPool VBoxNsplPL_FreeArenaPool
+#define PL_InitArenaPool VBoxNsplPL_InitArenaPool
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 PR_BEGIN_EXTERN_C

trunk/src/libs/xpcom18a4/nsprpub/lib/ds/plhash.h

@@ -43 +43 @@
 #include <stdio.h>
 #include "prtypes.h"
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PL_CompareStrings VBoxNsplPL_CompareStrings
+#define PL_CompareValues VBoxNsplPL_CompareValues
+#define PL_HashString VBoxNsplPL_HashString
+#define PL_HashTableAdd VBoxNsplPL_HashTableAdd
+#define PL_HashTableDestroy VBoxNsplPL_HashTableDestroy
+#define PL_HashTableLookup VBoxNsplPL_HashTableLookup
+#define PL_HashTableRemove VBoxNsplPL_HashTableRemove
+#define PL_NewHashTable VBoxNsplPL_NewHashTable
+#define PL_HashTableDump VBoxNsplPL_HashTableDump
+#define PL_HashTableEnumerateEntries VBoxNsplPL_HashTableEnumerateEntries
+#define PL_HashTableLookupConst VBoxNsplPL_HashTableLookupConst
+#define PL_HashTableRawAdd VBoxNsplPL_HashTableRawAdd
+#define PL_HashTableRawLookup VBoxNsplPL_HashTableRawLookup
+#define PL_HashTableRawLookupConst VBoxNsplPL_HashTableRawLookupConst
+#define PL_HashTableRawRemove VBoxNsplPL_HashTableRawRemove
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 PR_BEGIN_EXTERN_C

trunk/src/libs/xpcom18a4/nsprpub/lib/libc/include/plbase64.h

@@ -40 +40 @@
 
 #include "prtypes.h"
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PL_Base64Decode VBoxNsplPL_Base64Decode
+#define PL_Base64Encode VBoxNsplPL_Base64Encode
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 PR_BEGIN_EXTERN_C

trunk/src/libs/xpcom18a4/nsprpub/lib/libc/include/plerror.h

@@ -49 +49 @@
 #include "prtypes.h"
 
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PL_FPrintError VBoxNsplPL_FPrintError
+#define PL_PrintError VBoxNsplPL_PrintError
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
+
 PR_BEGIN_EXTERN_C
 /*

trunk/src/libs/xpcom18a4/nsprpub/lib/libc/include/plgetopt.h

@@ -47 +47 @@
 #include "prtypes.h"
 
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PL_CreateOptState VBoxNsplPL_CreateOptState
+#define PL_DestroyOptState VBoxNsplPL_DestroyOptState
+#define PL_GetNextOpt VBoxNsplPL_GetNextOpt
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
+
 PR_BEGIN_EXTERN_C
 

trunk/src/libs/xpcom18a4/nsprpub/lib/libc/include/plstr.h

@@ -62 +62 @@
 #include "prtypes.h"
 
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PL_strlen VBoxNsplPL_strlen
+#define PL_strcmp VBoxNsplPL_strcmp
+#define PL_strncmp VBoxNsplPL_strncmp
+#define PL_strcasecmp VBoxNsplPL_strcasecmp
+#define PL_strncasecmp VBoxNsplPL_strncasecmp
+#define PL_strdup VBoxNsplPL_strdup
+#define PL_strfree VBoxNsplPL_strfree
+#define PL_strncpy VBoxNsplPL_strncpy
+#define PL_strncpyz VBoxNsplPL_strncpyz
+#define PL_strrchr VBoxNsplPL_strrchr
+#define PL_strcaserstr VBoxNsplPL_strcaserstr
+#define PL_strcasestr VBoxNsplPL_strcasestr
+#define PL_strcat VBoxNsplPL_strcat
+#define PL_strcatn VBoxNsplPL_strcatn
+#define PL_strchr VBoxNsplPL_strchr
+#define PL_strcpy VBoxNsplPL_strcpy
+#define PL_strncaserstr VBoxNsplPL_strncaserstr
+#define PL_strncasestr VBoxNsplPL_strncasestr
+#define PL_strncat VBoxNsplPL_strncat
+#define PL_strnchr VBoxNsplPL_strnchr
+#define PL_strndup VBoxNsplPL_strndup
+#define PL_strnlen VBoxNsplPL_strnlen
+#define PL_strnpbrk VBoxNsplPL_strnpbrk
+#define PL_strnprbrk VBoxNsplPL_strnprbrk
+#define PL_strnrchr VBoxNsplPL_strnrchr
+#define PL_strnrstr VBoxNsplPL_strnrstr
+#define PL_strnstr VBoxNsplPL_strnstr
+#define PL_strpbrk VBoxNsplPL_strpbrk
+#define PL_strprbrk VBoxNsplPL_strprbrk
+#define PL_strrstr VBoxNsplPL_strrstr
+#define PL_strstr VBoxNsplPL_strstr
+#define PL_strtok_r VBoxNsplPL_strtok_r
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
+
 PR_BEGIN_EXTERN_C
 /*

trunk/src/libs/xpcom18a4/nsprpub/pr/include/obsolete/pralarm.h

@@ -66 +66 @@
 #include "prinrval.h"
 
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_CreateAlarm VBoxNsprPR_CreateAlarm
+#define PR_DestroyAlarm VBoxNsprPR_DestroyAlarm
+#define PR_SetAlarm VBoxNsprPR_SetAlarm
+#define PR_ResetAlarm VBoxNsprPR_ResetAlarm
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 PR_BEGIN_EXTERN_C

trunk/src/libs/xpcom18a4/nsprpub/pr/include/obsolete/probslet.h

@@ -45 +45 @@
 
 #include "prio.h"
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_Yield VBoxNsprPR_Yield
+#define PR_Select VBoxNsprPR_Select
+#define PR_FD_ZERO VBoxNsprPR_FD_ZERO
+#define PR_FD_SET VBoxNsprPR_FD_SET
+#define PR_FD_CLR VBoxNsprPR_FD_CLR
+#define PR_FD_ISSET VBoxNsprPR_FD_ISSET
+#define PR_FD_NSET VBoxNsprPR_FD_NSET
+#define PR_FD_NCLR VBoxNsprPR_FD_NCLR
+#define PR_FD_NISSET VBoxNsprPR_FD_NISSET
+#define PR_Stat VBoxNsprPR_Stat
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 PR_BEGIN_EXTERN_C

trunk/src/libs/xpcom18a4/nsprpub/pr/include/obsolete/prsem.h

@@ -45 +45 @@
 */
 #include "prtypes.h"
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_NewSem VBoxNsprPR_NewSem
+#define PR_DestroySem VBoxNsprPR_DestroySem
+#define PR_WaitSem VBoxNsprPR_WaitSem
+#define PR_PostSem VBoxNsprPR_PostSem
+#define PR_GetValueSem VBoxNsprPR_GetValueSem
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 PR_BEGIN_EXTERN_C

trunk/src/libs/xpcom18a4/nsprpub/pr/include/pratom.h

@@ -46 +46 @@
 #include "prtypes.h"
 #include "prlock.h"
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_AtomicDecrement VBoxNsprPR_AtomicDecrement
+#define PR_AtomicIncrement VBoxNsprPR_AtomicIncrement
+#define PR_AtomicAdd VBoxNsprPR_AtomicAdd
+#define PR_AtomicSet VBoxNsprPR_AtomicSet
+#define PR_CreateStack VBoxNsprPR_CreateStack
+#define PR_StackPush VBoxNsprPR_StackPush
+#define PR_StackPop VBoxNsprPR_StackPop
+#define PR_DestroyStack VBoxNsprPR_DestroyStack
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 PR_BEGIN_EXTERN_C

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prbit.h

@@ -40 +40 @@
 
 #include "prtypes.h"
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_CeilingLog2 VBoxNsprPR_CeilingLog2
+#define PR_FloorLog2 VBoxNsprPR_FloorLog2
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
+
 PR_BEGIN_EXTERN_C
 

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prcmon.h

@@ -52 +52 @@
 #include "prinrval.h"
 
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_CEnterMonitor VBoxNsprPR_CEnterMonitor
+#define PR_CExitMonitor VBoxNsprPR_CExitMonitor
+#define PR_CNotify VBoxNsprPR_CNotify
+#define PR_CWait VBoxNsprPR_CWait
+#define PR_CNotifyAll VBoxNsprPR_CNotifyAll
+#define PR_CSetOnMonitorRecycle VBoxNsprPR_CSetOnMonitorRecycle
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
+
 PR_BEGIN_EXTERN_C
 

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prcountr.h

@@ -107 +107 @@
 #include "prtypes.h"
 
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_CreateCounter VBoxNsprPR_CreateCounter
+#define PR_DestroyCounter VBoxNsprPR_DestroyCounter
+#define PR_GetCounterHandleFromName VBoxNsprPR_GetCounterHandleFromName
+#define PR_GetCounterNameFromHandle VBoxNsprPR_GetCounterNameFromHandle
+#define PR_IncrementCounter VBoxNsprPR_IncrementCounter
+#define PR_DecrementCounter VBoxNsprPR_DecrementCounter
+#define PR_AddToCounter VBoxNsprPR_AddToCounter
+#define PR_SubtractFromCounter VBoxNsprPR_SubtractFromCounter
+#define PR_GetCounter VBoxNsprPR_GetCounter
+#define PR_SetCounter VBoxNsprPR_SetCounter
+#define PR_FindNextCounterQname VBoxNsprPR_FindNextCounterQname
+#define PR_FindNextCounterRname VBoxNsprPR_FindNextCounterRname
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
+
 PR_BEGIN_EXTERN_C
 

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prcvar.h

@@ -41 +41 @@
 #include "prlock.h"
 #include "prinrval.h"
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_NewCondVar VBoxNsprPR_NewCondVar
+#define PR_DestroyCondVar VBoxNsprPR_DestroyCondVar
+#define PR_WaitCondVar VBoxNsprPR_WaitCondVar
+#define PR_NotifyCondVar VBoxNsprPR_NotifyCondVar
+#define PR_NotifyAllCondVar VBoxNsprPR_NotifyAllCondVar
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 PR_BEGIN_EXTERN_C

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prdtoa.h

@@ -40 +40 @@
 
 #include "prtypes.h"
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_cnvtf VBoxNsprPR_cnvtf
+#define PR_dtoa VBoxNsprPR_dtoa
+#define PR_strtod VBoxNsprPR_strtod
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 PR_BEGIN_EXTERN_C

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prenv.h

@@ -40 +40 @@
 
 #include "prtypes.h"
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_GetEnv VBoxNsprPR_GetEnv
+#define PR_SetEnv VBoxNsprPR_SetEnv
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 /*******************************************************************************/

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prerror.h

@@ -41 +41 @@
 #include "prtypes.h"
 
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_SetError VBoxNsprPR_SetError
+#define PR_SetErrorText VBoxNsprPR_SetErrorText
+#define PR_GetError VBoxNsprPR_GetError
+#define PR_GetOSError VBoxNsprPR_GetOSError
+#define PR_GetErrorTextLength VBoxNsprPR_GetErrorTextLength
+#define PR_GetErrorText VBoxNsprPR_GetErrorText
+#define PR_ErrorToString VBoxNsprPR_ErrorToString
+#define PR_ErrorToName VBoxNsprPR_ErrorToName
+#define PR_ErrorLanguages VBoxNsprPR_ErrorLanguages
+#define PR_ErrorInstallTable VBoxNsprPR_ErrorInstallTable
+#define PR_ErrorInstallCallback VBoxNsprPR_ErrorInstallCallback
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 PR_BEGIN_EXTERN_C
 

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prinit.h

@@ -44 +44 @@
 #include <stdio.h>
 
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_Abort VBoxNsprPR_Abort
+#define PR_Cleanup VBoxNsprPR_Cleanup
+#define PR_DisableClockInterrupts VBoxNsprPR_DisableClockInterrupts
+#define PR_EnableClockInterrupts VBoxNsprPR_EnableClockInterrupts
+#define PR_BlockClockInterrupts VBoxNsprPR_BlockClockInterrupts
+#define PR_UnblockClockInterrupts VBoxNsprPR_UnblockClockInterrupts
+#define PR_Init VBoxNsprPR_Init
+#define PR_Initialize VBoxNsprPR_Initialize
+#define PR_Initialized VBoxNsprPR_Initialized
+#define PR_VersionCheck VBoxNsprPR_VersionCheck
+#define PR_SetConcurrency VBoxNsprPR_SetConcurrency
+#define PR_SetFDCacheSize VBoxNsprPR_SetFDCacheSize
+#define PR_ProcessExit VBoxNsprPR_ProcessExit
+#define PR_CallOnce VBoxNsprPR_CallOnce
+#define PR_CallOnceWithArg VBoxNsprPR_CallOnceWithArg
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
+
 PR_BEGIN_EXTERN_C
 

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prinrval.h

@@ -52 +52 @@
 
 #include "prtypes.h"
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_IntervalNow VBoxNsprPR_IntervalNow
+#define PR_TicksPerSecond VBoxNsprPR_TicksPerSecond
+#define PR_SecondsToInterval VBoxNsprPR_SecondsToInterval
+#define PR_MillisecondsToInterval VBoxNsprPR_MillisecondsToInterval
+#define PR_MicrosecondsToInterval VBoxNsprPR_MicrosecondsToInterval
+#define PR_IntervalToSeconds VBoxNsprPR_IntervalToSeconds
+#define PR_IntervalToMilliseconds VBoxNsprPR_IntervalToMilliseconds
+#define PR_IntervalToMicroseconds VBoxNsprPR_IntervalToMicroseconds
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 PR_BEGIN_EXTERN_C

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prio.h

@@ -50 +50 @@
 #include "prinrval.h"
 #include "prinet.h"
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_GetInheritedFD VBoxNsprPR_GetInheritedFD
+#define PR_SetFDInheritable VBoxNsprPR_SetFDInheritable
+#define PR_Access VBoxNsprPR_Access
+#define PR_Open VBoxNsprPR_Open
+#define PR_Read VBoxNsprPR_Read
+#define PR_Write VBoxNsprPR_Write
+#define PR_Seek VBoxNsprPR_Seek
+#define PR_Seek64 VBoxNsprPR_Seek64
+#define PR_Poll VBoxNsprPR_Poll
+#define PR_NewPollableEvent VBoxNsprPR_NewPollableEvent
+#define PR_SetPollableEvent VBoxNsprPR_SetPollableEvent
+#define PR_WaitForPollableEvent VBoxNsprPR_WaitForPollableEvent
+#define PR_DestroyPollableEvent VBoxNsprPR_DestroyPollableEvent
+#define PR_Close VBoxNsprPR_Close
+#define PR_GetSpecialFD VBoxNsprPR_GetSpecialFD
+#define PR_Connect VBoxNsprPR_Connect
+#define PR_OpenTCPSocket VBoxNsprPR_OpenTCPSocket
+#define PR_SetSocketOption VBoxNsprPR_SetSocketOption
+#define PR_Bind VBoxNsprPR_Bind
+#define PR_Listen VBoxNsprPR_Listen
+#define PR_Accept VBoxNsprPR_Accept
+#define PR_AcceptRead VBoxNsprPR_AcceptRead
+#define PR_OpenDir VBoxNsprPR_OpenDir
+#define PR_ReadDir VBoxNsprPR_ReadDir
+#define PR_CloseDir VBoxNsprPR_CloseDir
+#define PR_CreatePipe VBoxNsprPR_CreatePipe
+#define PR_GetDescType VBoxNsprPR_GetDescType
+#define PR_GetSpecialFD VBoxNsprPR_GetSpecialFD
+#define PR_GetUniqueIdentity VBoxNsprPR_GetUniqueIdentity
+#define PR_GetNameForIdentity VBoxNsprPR_GetNameForIdentity
+#define PR_GetLayersIdentity VBoxNsprPR_GetLayersIdentity
+#define PR_GetIdentitiesLayer VBoxNsprPR_GetIdentitiesLayer
+#define PR_GetDefaultIOMethods VBoxNsprPR_GetDefaultIOMethods
+#define PR_CreateIOLayerStub VBoxNsprPR_CreateIOLayerStub
+#define PR_CreateIOLayer VBoxNsprPR_CreateIOLayer
+#define PR_PushIOLayer VBoxNsprPR_PushIOLayer
+#define PR_PopIOLayer VBoxNsprPR_PopIOLayer
+#define PR_OpenFile VBoxNsprPR_OpenFile
+#define PR_Writev VBoxNsprPR_Writev
+#define PR_Delete VBoxNsprPR_Delete
+#define PR_Rename VBoxNsprPR_Rename
+#define PR_GetFileInfo VBoxNsprPR_GetFileInfo
+#define PR_GetFileInfo64 VBoxNsprPR_GetFileInfo64
+#define PR_GetOpenFileInfo VBoxNsprPR_GetOpenFileInfo
+#define PR_GetOpenFileInfo64 VBoxNsprPR_GetOpenFileInfo64
+#define PR_Available VBoxNsprPR_Available
+#define PR_Available64 VBoxNsprPR_Available64
+#define PR_Sync VBoxNsprPR_Sync
+#define PR_MkDir VBoxNsprPR_MkDir
+#define PR_MakeDir VBoxNsprPR_MakeDir
+#define PR_RmDir VBoxNsprPR_RmDir
+#define PR_NewUDPSocket VBoxNsprPR_NewUDPSocket
+#define PR_NewTCPSocket VBoxNsprPR_NewTCPSocket
+#define PR_OpenUDPSocket VBoxNsprPR_OpenUDPSocket
+#define PR_OpenTCPSocket VBoxNsprPR_OpenTCPSocket
+#define PR_ConnectContinue VBoxNsprPR_ConnectContinue
+#define PR_GetConnectStatus VBoxNsprPR_GetConnectStatus
+#define PR_Shutdown VBoxNsprPR_Shutdown
+#define PR_Recv VBoxNsprPR_Recv
+#define PR_Send VBoxNsprPR_Send
+#define PR_RecvFrom VBoxNsprPR_RecvFrom
+#define PR_SendTo VBoxNsprPR_SendTo
+#define PR_TransmitFile VBoxNsprPR_TransmitFile
+#define PR_SendFile VBoxNsprPR_SendFile
+#define PR_NewTCPSocketPair VBoxNsprPR_NewTCPSocketPair
+#define PR_GetSockName VBoxNsprPR_GetSockName
+#define PR_GetPeerName VBoxNsprPR_GetPeerName
+#define PR_GetSocketOption VBoxNsprPR_GetSocketOption
+#define PR_CreateFileMap VBoxNsprPR_CreateFileMap
+#define PR_GetMemMapAlignment VBoxNsprPR_GetMemMapAlignment
+#define PR_MemMap VBoxNsprPR_MemMap
+#define PR_MemUnmap VBoxNsprPR_MemUnmap
+#define PR_CloseFileMap VBoxNsprPR_CloseFileMap
+#define PR_CreatePipe VBoxNsprPR_CreatePipe
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 PR_BEGIN_EXTERN_C

trunk/src/libs/xpcom18a4/nsprpub/pr/include/pripcsem.h

@@ -59 +59 @@
 #include "prtypes.h"
 #include "prio.h"
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_OpenSemaphore VBoxNsprPR_OpenSemaphore
+#define PR_WaitSemaphore VBoxNsprPR_WaitSemaphore
+#define PR_PostSemaphore VBoxNsprPR_PostSemaphore
+#define PR_CloseSemaphore VBoxNsprPR_CloseSemaphore
+#define PR_DeleteSemaphore VBoxNsprPR_DeleteSemaphore
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 PR_BEGIN_EXTERN_C

trunk/src/libs/xpcom18a4/nsprpub/pr/include/private/pprio.h

@@ -48 +48 @@
 #include "prio.h"
 
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_GetFileMethods VBoxNsprPR_GetFileMethods
+#define PR_GetTCPMethods VBoxNsprPR_GetTCPMethods
+#define PR_GetUDPMethods VBoxNsprPR_GetUDPMethods
+#define PR_GetPipeMethods VBoxNsprPR_GetPipeMethods
+#define PR_FileDesc2NativeHandle VBoxNsprPR_FileDesc2NativeHandle
+#define PR_ChangeFileDescNativeHandle VBoxNsprPR_ChangeFileDescNativeHandle
+#define PR_AllocFileDesc VBoxNsprPR_AllocFileDesc
+#define PR_FreeFileDesc VBoxNsprPR_FreeFileDesc
+#define PR_ImportFile VBoxNsprPR_ImportFile
+#define PR_ImportPipe VBoxNsprPR_ImportPipe
+#define PR_ImportTCPSocket VBoxNsprPR_ImportTCPSocket
+#define PR_ImportUDPSocket VBoxNsprPR_ImportUDPSocket
+#define PR_CreateSocketPollFd VBoxNsprPR_CreateSocketPollFd
+#define PR_DestroySocketPollFd VBoxNsprPR_DestroySocketPollFd
+#define PR_Socket VBoxNsprPR_Socket
+#define PR_LockFile VBoxNsprPR_LockFile
+#define PR_TLockFile VBoxNsprPR_TLockFile
+#define PR_UnlockFile VBoxNsprPR_UnlockFile
+#define PR_EmulateAcceptRead VBoxNsprPR_EmulateAcceptRead
+#define PR_EmulateSendFile VBoxNsprPR_EmulateSendFile
+#define PR_NTFast_AcceptRead VBoxNsprPR_NTFast_AcceptRead
+#define PR_NTFast_AcceptRead_WithTimeoutCallback VBoxNsprPR_NTFast_AcceptRead_WithTimeoutCallback
+#define PR_NTFast_Accept VBoxNsprPR_NTFast_Accept
+#define PR_NTFast_UpdateAcceptContext VBoxNsprPR_NTFast_UpdateAcceptContext
+#define PR_NT_CancelIo VBoxNsprPR_NT_CancelIo
+#define PR_Init_Log VBoxNsprPR_Init_Log
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
+
 PR_BEGIN_EXTERN_C
 

trunk/src/libs/xpcom18a4/nsprpub/pr/include/private/pprthred.h

@@ -52 +52 @@
 #endif
 
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_AttachThread VBoxNsprPR_AttachThread
+#define PR_DetachThread VBoxNsprPR_DetachThread
+#define PR_GetThreadID VBoxNsprPR_GetThreadID
+#define PR_SetThreadDumpProc VBoxNsprPR_SetThreadDumpProc
+#define PR_GetThreadAffinityMask VBoxNsprPR_GetThreadAffinityMask
+#define PR_SetThreadAffinityMask VBoxNsprPR_SetThreadAffinityMask
+#define PR_SetCPUAffinityMask VBoxNsprPR_SetCPUAffinityMask
+#define PR_ShowStatus VBoxNsprPR_ShowStatus
+#define PR_SetThreadRecycleMode VBoxNsprPR_SetThreadRecycleMode
+#define PR_CreateThreadGCAble VBoxNsprPR_CreateThreadGCAble
+#define PR_AttachThreadGCAble VBoxNsprPR_AttachThreadGCAble
+#define PR_SetThreadGCAble VBoxNsprPR_SetThreadGCAble
+#define PR_ClearThreadGCAble VBoxNsprPR_ClearThreadGCAble
+#define PR_SuspendAll VBoxNsprPR_SuspendAll
+#define PR_ResumeAll VBoxNsprPR_ResumeAll
+#define PR_GetSP VBoxNsprPR_GetSP
+#define PR_GetGCRegisters VBoxNsprPR_GetGCRegisters
+#define GetExecutionEnvironment VBoxNsprGetExecutionEnvironment
+#define SetExecutionEnvironment VBoxNsprSetExecutionEnvironment
+#define PR_EnumerateThreads VBoxNsprPR_EnumerateThreads
+#define PR_ThreadScanStackPointers VBoxNsprPR_ThreadScanStackPointers
+#define PR_ScanStackPointers VBoxNsprPR_ScanStackPointers
+#define PR_GetStackSpaceLeft VBoxNsprPR_GetStackSpaceLeft
+#define PR_NewNamedMonitor VBoxNsprPR_NewNamedMonitor
+#define PR_TestAndLock VBoxNsprPR_TestAndLock
+#define PR_TestAndEnterMonitor VBoxNsprPR_TestAndEnterMonitor
+#define PR_GetMonitorEntryCount VBoxNsprPR_GetMonitorEntryCount
+#define PR_CTestAndEnterMonitor VBoxNsprPR_CTestAndEnterMonitor
+#define PR_Mac_WaitForAsyncNotify VBoxNsprPR_Mac_WaitForAsyncNotify
+#define PR_Mac_PostAsyncNotify VBoxNsprPR_Mac_PostAsyncNotify
+#define PR_OS2_SetFloatExcpHandler VBoxNsprPR_OS2_SetFloatExcpHandler
+#define PR_OS2_UnsetFloatExcpHandler VBoxNsprPR_OS2_UnsetFloatExcpHandler
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
+
 PR_BEGIN_EXTERN_C
 

trunk/src/libs/xpcom18a4/nsprpub/pr/include/private/primpl.h

@@ -139 +139 @@
 */
 
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PT_FPrintStats VBoxNsprPT_FPrintStats
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
+
 PR_BEGIN_EXTERN_C
 

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prlink.h

@@ -44 +44 @@
 #include "prtypes.h"
 
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_SetLibraryPath VBoxNsprPR_SetLibraryPath
+#define PR_GetLibraryPath VBoxNsprPR_GetLibraryPath
+#define PR_GetLibraryName VBoxNsprPR_GetLibraryName
+#define PR_FreeLibraryName VBoxNsprPR_FreeLibraryName
+#define PR_LoadLibrary VBoxNsprPR_LoadLibrary
+#define PR_LoadLibraryWithFlags VBoxNsprPR_LoadLibraryWithFlags
+#define PR_UnloadLibrary VBoxNsprPR_UnloadLibrary
+#define PR_FindSymbol VBoxNsprPR_FindSymbol
+#define PR_FindFunctionSymbol VBoxNsprPR_FindFunctionSymbol
+#define PR_FindSymbolAndLibrary VBoxNsprPR_FindSymbolAndLibrary
+#define PR_FindFunctionSymbolAndLibrary VBoxNsprPR_FindFunctionSymbolAndLibrary
+#define PR_LoadStaticLibrary VBoxNsprPR_LoadStaticLibrary
+#define PR_GetLibraryFilePathname VBoxNsprPR_GetLibraryFilePathname
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
+
 PR_BEGIN_EXTERN_C
 

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prlock.h

@@ -50 +50 @@
 
 #include "prtypes.h"
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_DestroyLock VBoxNsprPR_DestroyLock
+#define PR_Lock VBoxNsprPR_Lock
+#define PR_NewLock VBoxNsprPR_NewLock
+#define PR_Unlock VBoxNsprPR_Unlock
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 PR_BEGIN_EXTERN_C

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prlog.h

@@ -41 +41 @@
 #include "prtypes.h"
 
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_NewLogModule VBoxNsprPR_NewLogModule
+#define PR_SetLogFile VBoxNsprPR_SetLogFile
+#define PR_SetLogBuffering VBoxNsprPR_SetLogBuffering
+#define PR_LogPrint VBoxNsprPR_LogPrint
+#define PR_LogFlush VBoxNsprPR_LogFlush
+#define PR_Assert VBoxNsprPR_Assert
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
+
 PR_BEGIN_EXTERN_C
 

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prlong.h

@@ -48 +48 @@
 
 #include "prtypes.h"
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define LL_MaxInt VBoxNsllLL_MaxInt
+#define LL_MaxUint VBoxNsllLL_MaxUint
+#define LL_MinInt VBoxNsllLL_MinInt
+#define LL_Zero VBoxNsllLL_Zero
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 PR_BEGIN_EXTERN_C

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prmem.h

@@ -47 +47 @@
 #include <stddef.h>
 #include <stdlib.h>
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_Malloc VBoxNsprPR_Malloc
+#define PR_Calloc VBoxNsprPR_Calloc
+#define PR_Realloc VBoxNsprPR_Realloc
+#define PR_Free VBoxNsprPR_Free
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 PR_BEGIN_EXTERN_C

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prmon.h

@@ -41 +41 @@
 #include "prtypes.h"
 #include "prinrval.h"
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_EnterMonitor VBoxNsprPR_EnterMonitor
+#define PR_ExitMonitor VBoxNsprPR_ExitMonitor
+#define PR_Notify VBoxNsprPR_Notify
+#define PR_NotifyAll VBoxNsprPR_NotifyAll
+#define PR_Wait VBoxNsprPR_Wait
+#define PR_NewMonitor VBoxNsprPR_NewMonitor
+#define PR_DestroyMonitor VBoxNsprPR_DestroyMonitor
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 PR_BEGIN_EXTERN_C

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prmwait.h

@@ -44 +44 @@
 #include "prclist.h"
 
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_AddWaitFileDesc VBoxNsprPR_AddWaitFileDesc
+#define PR_CancelWaitFileDesc VBoxNsprPR_CancelWaitFileDesc
+#define PR_CancelWaitGroup VBoxNsprPR_CancelWaitGroup
+#define PR_CreateWaitGroup VBoxNsprPR_CreateWaitGroup
+#define PR_CreateMWaitEnumerator VBoxNsprPR_CreateMWaitEnumerator
+#define PR_DestroyWaitGroup VBoxNsprPR_DestroyWaitGroup
+#define PR_DestroyMWaitEnumerator VBoxNsprPR_DestroyMWaitEnumerator
+#define PR_EnumerateWaitGroup VBoxNsprPR_EnumerateWaitGroup
+#define PR_WaitRecvReady VBoxNsprPR_WaitRecvReady
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
+
 PR_BEGIN_EXTERN_C
 

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prnetdb.h

@@ -41 +41 @@
 #include "prtypes.h"
 #include "prio.h"
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_StringToNetAddr VBoxNsprPR_StringToNetAddr
+#define PR_NetAddrToString VBoxNsprPR_NetAddrToString
+#define PR_GetHostByName VBoxNsprPR_GetHostByName
+#define PR_GetIPNodeByName VBoxNsprPR_GetIPNodeByName
+#define PR_GetHostByAddr VBoxNsprPR_GetHostByAddr
+#define PR_EnumerateHostEnt VBoxNsprPR_EnumerateHostEnt
+#define PR_InitializeNetAddr VBoxNsprPR_InitializeNetAddr
+#define PR_SetNetAddr VBoxNsprPR_SetNetAddr
+#define PR_IsNetAddrType VBoxNsprPR_IsNetAddrType
+#define PR_ConvertIPv4AddrToIPv6 VBoxNsprPR_ConvertIPv4AddrToIPv6
+#define PR_GetProtoByName VBoxNsprPR_GetProtoByName
+#define PR_GetProtoByNumber VBoxNsprPR_GetProtoByNumber
+#define PR_GetAddrInfoByName VBoxNsprPR_GetAddrInfoByName
+#define PR_FreeAddrInfo VBoxNsprPR_FreeAddrInfo
+#define PR_EnumerateAddrInfo VBoxNsprPR_EnumerateAddrInfo
+#define PR_GetCanonNameFromAddrInfo VBoxNsprPR_GetCanonNameFromAddrInfo
+#define PR_htonl VBoxNsprPR_htonl
+#define PR_htonll VBoxNsprPR_htonll
+#define PR_htons VBoxNsprPR_htons
+#define PR_ntohl VBoxNsprPR_ntohl
+#define PR_ntohll VBoxNsprPR_ntohll
+#define PR_ntohs VBoxNsprPR_ntohs
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 PR_BEGIN_EXTERN_C

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prolock.h

@@ -41 +41 @@
 #include "prtypes.h"
 
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_CreateOrderedLock VBoxNsprPR_CreateOrderedLock
+#define PR_DestroyOrderedLock VBoxNsprPR_DestroyOrderedLock
+#define PR_LockOrderedLock VBoxNsprPR_LockOrderedLock
+#define PR_UnlockOrderedLock VBoxNsprPR_UnlockOrderedLock
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
+
 PR_BEGIN_EXTERN_C
 

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prpdce.h

@@ -50 +50 @@
 #include "prtypes.h"
 #include "prinrval.h"
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PRP_DestroyNakedCondVar VBoxNsprPRP_DestroyNakedCondVar
+#define PRP_NakedBroadcast VBoxNsprPRP_NakedBroadcast
+#define PRP_NakedNotify VBoxNsprPRP_NakedNotify
+#define PRP_NakedWait VBoxNsprPRP_NakedWait
+#define PRP_NewNakedCondVar VBoxNsprPRP_NewNakedCondVar
+#define PRP_TryLock VBoxNsprPRP_TryLock
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 PR_BEGIN_EXTERN_C

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prprf.h

@@ -59 +59 @@
 #include <stdio.h>
 #include <stdarg.h>
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_snprintf VBoxNsprPR_snprintf
+#define PR_vsnprintf VBoxNsprPR_vsnprintf
+#define PR_smprintf VBoxNsprPR_smprintf
+#define PR_smprintf_free VBoxNsprPR_smprintf_free
+#define PR_sprintf_append VBoxNsprPR_sprintf_append
+#define PR_sxprintf VBoxNsprPR_sxprintf
+#define PR_fprintf VBoxNsprPR_fprintf
+#define PR_vsmprintf VBoxNsprPR_vsmprintf
+#define PR_vsprintf_append VBoxNsprPR_vsprintf_append
+#define PR_vsxprintf VBoxNsprPR_vsxprintf
+#define PR_vfprintf VBoxNsprPR_vfprintf
+#define PR_sscanf VBoxNsprPR_sscanf
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 PR_BEGIN_EXTERN_C

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prproces.h

@@ -41 +41 @@
 #include "prtypes.h"
 #include "prio.h"
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_CreateProcessDetached VBoxNsprPR_CreateProcessDetached
+#define PR_ProcessAttrSetInheritableFD VBoxNsprPR_ProcessAttrSetInheritableFD
+#define PR_DestroyProcessAttr VBoxNsprPR_DestroyProcessAttr
+#define PR_NewProcessAttr VBoxNsprPR_NewProcessAttr
+#define PR_ResetProcessAttr VBoxNsprPR_ResetProcessAttr
+#define PR_ProcessAttrSetStdioRedirect VBoxNsprPR_ProcessAttrSetStdioRedirect
+#define PR_SetStdioRedirect VBoxNsprPR_SetStdioRedirect
+#define PR_ProcessAttrSetCurrentDirectory VBoxNsprPR_ProcessAttrSetCurrentDirectory
+#define PR_CreateProcess VBoxNsprPR_CreateProcess
+#define PR_DetachProcess VBoxNsprPR_DetachProcess
+#define PR_WaitProcess VBoxNsprPR_WaitProcess
+#define PR_KillProcess VBoxNsprPR_KillProcess
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 PR_BEGIN_EXTERN_C

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prrng.h

@@ -48 +48 @@
 
 #include "prtypes.h"
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_GetRandomNoise VBoxNsprPR_GetRandomNoise
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 PR_BEGIN_EXTERN_C

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prrwlock.h

@@ -46 +46 @@
 
 #include "prtypes.h"
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_NewRWLock VBoxNsprPR_NewRWLock
+#define PR_DestroyRWLock VBoxNsprPR_DestroyRWLock
+#define PR_RWLock_Rlock VBoxNsprPR_RWLock_Rlock
+#define PR_RWLock_Wlock VBoxNsprPR_RWLock_Wlock
+#define PR_RWLock_Unlock VBoxNsprPR_RWLock_Unlock
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 PR_BEGIN_EXTERN_C

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prshm.h

@@ -135 +135 @@
 #include "prio.h"
 
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_OpenSharedMemory VBoxNsprPR_OpenSharedMemory
+#define PR_AttachSharedMemory VBoxNsprPR_AttachSharedMemory
+#define PR_DetachSharedMemory VBoxNsprPR_DetachSharedMemory
+#define PR_CloseSharedMemory VBoxNsprPR_CloseSharedMemory
+#define PR_DeleteSharedMemory VBoxNsprPR_DeleteSharedMemory
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
+
 PR_BEGIN_EXTERN_C
 

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prshma.h

@@ -136 +136 @@
 #include "prproces.h"
 
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_OpenAnonFileMap VBoxNsprPR_OpenAnonFileMap
+#define PR_ProcessAttrSetInheritableFileMap VBoxNsprPR_ProcessAttrSetInheritableFileMap
+#define PR_GetInheritedFileMap VBoxNsprPR_GetInheritedFileMap
+#define PR_ExportFileMapAsString VBoxNsprPR_ExportFileMapAsString
+#define PR_ImportFileMapFromString VBoxNsprPR_ImportFileMapFromString
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
+
 PR_BEGIN_EXTERN_C
 

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prsystem.h

@@ -43 +43 @@
 */
 #include "prtypes.h"
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_GetDirectorySeparator VBoxNsprPR_GetDirectorySeparator
+#define PR_GetDirectorySepartor VBoxNsprPR_GetDirectorySepartor
+#define PR_GetPathSeparator VBoxNsprPR_GetPathSeparator
+#define PR_GetSystemInfo VBoxNsprPR_GetSystemInfo
+#define PR_GetPageSize VBoxNsprPR_GetPageSize
+#define PR_GetPageShift VBoxNsprPR_GetPageShift
+#define PR_GetNumberOfProcessors VBoxNsprPR_GetNumberOfProcessors
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 PR_BEGIN_EXTERN_C

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prthread.h

@@ -79 +79 @@
 #include "prinrval.h"
 
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_CreateThread VBoxNsprPR_CreateThread
+#define PR_JoinThread VBoxNsprPR_JoinThread
+#define PR_Sleep VBoxNsprPR_Sleep
+#define PR_GetCurrentThread VBoxNsprPR_GetCurrentThread
+#define PR_GetThreadState VBoxNsprPR_GetThreadState
+#define PR_SetThreadPrivate VBoxNsprPR_SetThreadPrivate
+#define PR_GetThreadPrivate VBoxNsprPR_GetThreadPrivate
+#define PR_NewThreadPrivateIndex VBoxNsprPR_NewThreadPrivateIndex
+#define PR_GetThreadPriority VBoxNsprPR_GetThreadPriority
+#define PR_SetThreadPriority VBoxNsprPR_SetThreadPriority
+#define PR_Interrupt VBoxNsprPR_Interrupt
+#define PR_ClearInterrupt VBoxNsprPR_ClearInterrupt
+#define PR_BlockInterrupt VBoxNsprPR_BlockInterrupt
+#define PR_UnblockInterrupt VBoxNsprPR_UnblockInterrupt
+#define PR_GetThreadScope VBoxNsprPR_GetThreadScope
+#define PR_GetThreadType VBoxNsprPR_GetThreadType
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
+
 PR_BEGIN_EXTERN_C
 

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prtime.h

@@ -50 +50 @@
 
 #include "prlong.h"
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_Now VBoxNsprPR_Now
+#define PR_ExplodeTime VBoxNsprPR_ExplodeTime
+#define PR_ImplodeTime VBoxNsprPR_ImplodeTime
+#define PR_NormalizeTime VBoxNsprPR_NormalizeTime
+#define PR_LocalTimeParameters VBoxNsprPR_LocalTimeParameters
+#define PR_GMTParameters VBoxNsprPR_GMTParameters
+#define PR_USPacificTimeParameters VBoxNsprPR_USPacificTimeParameters
+#define PR_ParseTimeString VBoxNsprPR_ParseTimeString
+#define PR_FormatTime VBoxNsprPR_FormatTime
+#define PR_FormatTimeUSEnglish VBoxNsprPR_FormatTimeUSEnglish
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 PR_BEGIN_EXTERN_C

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prtpool.h

@@ -49 +49 @@
  *              CHANGE
  */
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_CreateThreadPool VBoxNsprPR_CreateThreadPool
+#define PR_QueueJobPR_QueueJob_Read VBoxNsprPR_QueueJobPR_QueueJob_Read
+#define PR_QueueJob VBoxNsprPR_QueueJob
+#define PR_QueueJob_Read VBoxNsprPR_QueueJob_Read
+#define PR_QueueJob_Write VBoxNsprPR_QueueJob_Write
+#define PR_QueueJob_Accept VBoxNsprPR_QueueJob_Accept
+#define PR_QueueJob_Connect VBoxNsprPR_QueueJob_Connect
+#define PR_QueueJob_Timer VBoxNsprPR_QueueJob_Timer
+#define PR_CancelJob VBoxNsprPR_CancelJob
+#define PR_JoinJob VBoxNsprPR_JoinJob
+#define PR_ShutdownThreadPool VBoxNsprPR_ShutdownThreadPool
+#define PR_JoinThreadPool VBoxNsprPR_JoinThreadPool
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 PR_BEGIN_EXTERN_C

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prtrace.h

@@ -98 +98 @@
 #include "prtime.h"
 
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_CreateTrace VBoxNsprPR_CreateTrace
+#define PR_DestroyTrace VBoxNsprPR_DestroyTrace
+#define PR_Trace VBoxNsprPR_Trace
+#define PR_SetTraceOption VBoxNsprPR_SetTraceOption
+#define PR_GetTraceOption VBoxNsprPR_GetTraceOption
+#define PR_GetTraceHandleFromName VBoxNsprPR_GetTraceHandleFromName
+#define PR_GetTraceNameFromHandle VBoxNsprPR_GetTraceNameFromHandle
+#define PR_FindNextTraceQname VBoxNsprPR_FindNextTraceQname
+#define PR_FindNextTraceRname VBoxNsprPR_FindNextTraceRname
+#define PR_RecordTraceEntries VBoxNsprPR_RecordTraceEntries
+#define PR_GetTraceEntries VBoxNsprPR_GetTraceEntries
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
+
 PR_BEGIN_EXTERN_C
 

trunk/src/libs/xpcom18a4/nsprpub/pr/src/linking/prlink.c

@@ -34 +34 @@
 
 #include "primpl.h"
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_FindLibrary VBoxNsprPR_FindLibrary
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 #include <string.h>

trunk/src/libs/xpcom18a4/nsprpub/pr/src/malloc/prmem.c

@@ -44 +44 @@
 #ifdef _PR_ZONE_ALLOCATOR
 
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PR_FPrintZoneStats VBoxNsprPR_FPrintZoneStats
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
+
 /*
 ** The zone allocator code must use native mutexes and cannot

trunk/src/libs/xpcom18a4/xpcom/base/nsTraceRefcntImpl.h

@@ -41 +41 @@
 #include <stdio.h> // for FILE
 #include "nsITraceRefcnt.h"
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define NS_MeanAndStdDev VBoxNsxpNS_MeanAndStdDev
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 class nsTraceRefcntImpl : public nsITraceRefcnt

trunk/src/libs/xpcom18a4/xpcom/build/nsXPCOM.h

@@ -41 +41 @@
 #include "nscore.h"
 #include "nsXPCOMCID.h"
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define NS_InitXPCOM2 VBoxNsxpNS_InitXPCOM2
+#define NS_ShutdownXPCOM VBoxNsxpNS_ShutdownXPCOM
+#define NS_NewNativeLocalFile VBoxNsxpNS_NewNativeLocalFile
+#define NS_GetServiceManager VBoxNsxpNS_GetServiceManager
+#define NS_GetComponentManager VBoxNsxpNS_GetComponentManager
+#define NS_GetComponentRegistrar VBoxNsxpNS_GetComponentRegistrar
+#define NS_GetDebug VBoxNsxpNS_GetDebug
+#define NS_GetMemoryManager VBoxNsxpNS_GetMemoryManager
+#define NS_GetTraceRefcnt VBoxNsxpNS_GetTraceRefcnt
+#define NS_NewLocalFile VBoxNsxpNS_NewLocalFile
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 class nsAString;

trunk/src/libs/xpcom18a4/xpcom/build/nsXPCOMPrivate.h

@@ -45 +45 @@
 class nsStringContainer;
 class nsCStringContainer;
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define NS_GetFrozenFunctions VBoxNsxpNS_GetFrozenFunctions
+#define NS_RegisterXPCOMExitRoutine VBoxNsxpNS_RegisterXPCOMExitRoutine
+#define NS_UnregisterXPCOMExitRoutine VBoxNsxpNS_UnregisterXPCOMExitRoutine
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 /**

trunk/src/libs/xpcom18a4/xpcom/ds/nsEnumeratorUtils.h

@@ -41 +41 @@
 #include "nsIEnumerator.h"
 #include "nsISupportsArray.h"
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define NS_NewSingletonEnumerator VBoxNsxpNS_NewSingletonEnumerator
+#define NS_NewUnionEnumerator VBoxNsxpNS_NewUnionEnumerator
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 class NS_COM nsArrayEnumerator : public nsISimpleEnumerator

trunk/src/libs/xpcom18a4/xpcom/ds/nsIEnumerator.idl

@@ -40 +40 @@
 %{C++
 #define NS_ENUMERATOR_FALSE 1
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define NS_NewEmptyEnumerator VBoxNsxpNS_NewEmptyEnumerator
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
+
 extern "C" NS_COM nsresult
 NS_NewEmptyEnumerator(nsISimpleEnumerator** aResult);

trunk/src/libs/xpcom18a4/xpcom/ds/nsQuickSort.h

@@ -45 +45 @@
 
 #include "prtypes.h"
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define NS_QuickSort VBoxNsxpNS_QuickSort
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
+
 PR_BEGIN_EXTERN_C
 

trunk/src/libs/xpcom18a4/xpcom/ds/pldhash.h

@@ -44 +44 @@
  */
 #include "prtypes.h"
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PL_DHashTableInit VBoxNsplPL_DHashTableInit
+#define PL_DHashTableFinish VBoxNsplPL_DHashTableFinish
+#define PL_DHashTableOperate VBoxNsplPL_DHashTableOperate
+#define PL_DHashTableEnumerate VBoxNsplPL_DHashTableEnumerate
+#define PL_DHashAllocTable VBoxNsplPL_DHashAllocTable
+#define PL_DHashFreeTable VBoxNsplPL_DHashFreeTable
+#define PL_DHashMoveEntryStub VBoxNsplPL_DHashMoveEntryStub
+#define PL_DHashFinalizeStub VBoxNsplPL_DHashFinalizeStub
+#define PL_DHashClearEntryStub VBoxNsplPL_DHashClearEntryStub
+#define PL_DHashFreeStringKey VBoxNsplPL_DHashFreeStringKey
+#define PL_DHashGetKeyStub VBoxNsplPL_DHashGetKeyStub
+#define PL_DHashGetStubOps VBoxNsplPL_DHashGetStubOps
+#define PL_DHashMatchEntryStub VBoxNsplPL_DHashMatchEntryStub
+#define PL_DHashMatchStringKey VBoxNsplPL_DHashMatchStringKey
+#define PL_DHashStringKey VBoxNsplPL_DHashStringKey
+#define PL_DHashTableDestroy VBoxNsplPL_DHashTableDestroy
+#define PL_DHashTableRawRemove VBoxNsplPL_DHashTableRawRemove
+#define PL_DHashTableSetAlphaBounds VBoxNsplPL_DHashTableSetAlphaBounds
+#define PL_DHashVoidPtrKeyStub VBoxNsplPL_DHashVoidPtrKeyStub
+#define PL_NewDHashTable VBoxNsplPL_NewDHashTable
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 PR_BEGIN_EXTERN_C

trunk/src/libs/xpcom18a4/xpcom/io/nsIStringStream.idl

@@ -101 +101 @@
 #include "nsString.h"
 
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define NS_NewByteInputStream VBoxNsxpNS_NewByteInputStream
+#define NS_NewCStringInputStream VBoxNsxpNS_NewCStringInputStream
+#define NS_NewCharInputStream VBoxNsxpNS_NewCharInputStream
+#define NS_NewStringInputStream VBoxNsxpNS_NewStringInputStream
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
+
 //-----------------------------------------------------------------------------
 // Factory method to get an nsInputStream from an nsAString.  Result will

trunk/src/libs/xpcom18a4/xpcom/reflect/xptcall/public/xptcall.h

@@ -47 +47 @@
 #include "xptinfo.h"
 #include "nsIInterfaceInfo.h"
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define XPTC_InvokeByIndex VBoxNsxpXPTC_InvokeByIndex
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 /***************************************************************************/

trunk/src/libs/xpcom18a4/xpcom/reflect/xptinfo/public/xptinfo.h

@@ -43 +43 @@
 #include "prtypes.h"
 #include "xpt_struct.h"
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define XPTI_GetInterfaceInfoManager VBoxNsxpXPTI_GetInterfaceInfoManager
+#define XPTI_FreeInterfaceInfoManager VBoxNsxpXPTI_FreeInterfaceInfoManager
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 /*

trunk/src/libs/xpcom18a4/xpcom/string/public/nsStringAPI.h

@@ -48 +48 @@
 
 #include "nscore.h"
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define NS_CStringContainerInit VBoxNsxpNS_CStringContainerInit
+#define NS_CStringContainerFinish VBoxNsxpNS_CStringContainerFinish
+#define NS_CStringCloneData VBoxNsxpNS_CStringCloneData
+#define NS_CStringCopy VBoxNsxpNS_CStringCopy
+#define NS_CStringGetData VBoxNsxpNS_CStringGetData
+#define NS_CStringSetData VBoxNsxpNS_CStringSetData
+#define NS_CStringSetDataRange VBoxNsxpNS_CStringSetDataRange
+#define NS_UTF16ToCString VBoxNsxpNS_UTF16ToCString
+#define NS_CStringToUTF16 VBoxNsxpNS_CStringToUTF16
+#define NS_StringContainerInit VBoxNsxpNS_StringContainerInit
+#define NS_StringContainerFinish VBoxNsxpNS_StringContainerFinish
+#define NS_StringCloneData VBoxNsxpNS_StringCloneData
+#define NS_StringCopy VBoxNsxpNS_StringCopy
+#define NS_StringGetData VBoxNsxpNS_StringGetData
+#define NS_StringSetData VBoxNsxpNS_StringSetData
+#define NS_StringSetDataRange VBoxNsxpNS_StringSetDataRange
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 #define NS_STRINGAPI(x) extern "C" NS_COM x

trunk/src/libs/xpcom18a4/xpcom/threads/plevent.h

@@ -201 +201 @@
 #include <os2.h>
 #endif
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define PL_DestroyEvent VBoxNsplPL_DestroyEvent
+#define PL_HandleEvent VBoxNsplPL_HandleEvent
+#define PL_InitEvent VBoxNsplPL_InitEvent
+#define PL_CreateEventQueue VBoxNsplPL_CreateEventQueue
+#define PL_CreateMonitoredEventQueue VBoxNsplPL_CreateMonitoredEventQueue
+#define PL_CreateNativeEventQueue VBoxNsplPL_CreateNativeEventQueue
+#define PL_DequeueEvent VBoxNsplPL_DequeueEvent
+#define PL_DestroyEventQueue VBoxNsplPL_DestroyEventQueue
+#define PL_EventAvailable VBoxNsplPL_EventAvailable
+#define PL_EventLoop VBoxNsplPL_EventLoop
+#define PL_GetEvent VBoxNsplPL_GetEvent
+#define PL_GetEventOwner VBoxNsplPL_GetEventOwner
+#define PL_GetEventQueueMonitor VBoxNsplPL_GetEventQueueMonitor
+#define PL_GetEventQueueSelectFD VBoxNsplPL_GetEventQueueSelectFD
+#define PL_MapEvents VBoxNsplPL_MapEvents
+#define PL_PostEvent VBoxNsplPL_PostEvent
+#define PL_PostSynchronousEvent VBoxNsplPL_PostSynchronousEvent
+#define PL_ProcessEventsBeforeID VBoxNsplPL_ProcessEventsBeforeID
+#define PL_ProcessPendingEvents VBoxNsplPL_ProcessPendingEvents
+#define PL_RegisterEventIDFunc VBoxNsplPL_RegisterEventIDFunc
+#define PL_RevokeEvents VBoxNsplPL_RevokeEvents
+#define PL_UnregisterEventIDFunc VBoxNsplPL_UnregisterEventIDFunc
+#define PL_WaitForEvent VBoxNsplPL_WaitForEvent
+#define PL_IsQueueNative VBoxNsplPL_IsQueueNative
+#define PL_IsQueueOnCurrentThread VBoxNsplPL_IsQueueOnCurrentThread
+#define PL_FavorPerformanceHint VBoxNsplPL_FavorPerformanceHint
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 PR_BEGIN_EXTERN_C

trunk/src/libs/xpcom18a4/xpcom/typelib/xpt/public/xpt_arena.h

@@ -46 +46 @@
 #include <stdlib.h>
 
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define XPT_NewArena VBoxNsxpXPT_NewArena
+#define XPT_ArenaMalloc VBoxNsxpXPT_ArenaMalloc
+#define XPT_DestroyArena VBoxNsxpXPT_DestroyArena
+#define XPT_ArenaFree VBoxNsxpXPT_ArenaFree
+#define XPT_DestroyArena VBoxNsxpXPT_DestroyArena
+#define XPT_DumpStats VBoxNsxpXPT_DumpStats
+#define XPT_NotifyDoneLoading VBoxNsxpXPT_NotifyDoneLoading
+#define XPT_ArenaStrDup VBoxNsxpXPT_ArenaStrDup
+#define XPT_AssertFailed VBoxNsxpXPT_AssertFailed
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 /*

trunk/src/libs/xpcom18a4/xpcom/typelib/xpt/public/xpt_struct.h

@@ -45 +45 @@
 
 #include "xpt_arena.h"
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define XPT_NewHeader VBoxNsxpXPT_NewHeader
+#define XPT_NewStringZ VBoxNsxpXPT_NewStringZ
+#define XPT_NewAnnotation VBoxNsxpXPT_NewAnnotation
+#define XPT_SizeOfHeaderBlock VBoxNsxpXPT_SizeOfHeaderBlock
+#define XPT_NewInterfaceDescriptor VBoxNsxpXPT_NewInterfaceDescriptor
+#define XPT_FillInterfaceDirectoryEntry VBoxNsxpXPT_FillInterfaceDirectoryEntry
+#define XPT_FillMethodDescriptor VBoxNsxpXPT_FillMethodDescriptor
+#define XPT_FreeHeader VBoxNsxpXPT_FreeHeader
+#define XPT_ParseVersionString VBoxNsxpXPT_ParseVersionString
+#define XPT_DestroyInterfaceDirectoryEntry VBoxNsxpXPT_DestroyInterfaceDirectoryEntry
+#define XPT_FillParamDescriptor VBoxNsxpXPT_FillParamDescriptor
+#define XPT_FreeInterfaceDescriptor VBoxNsxpXPT_FreeInterfaceDescriptor
+#define XPT_InterfaceDescriptorAddConsts VBoxNsxpXPT_InterfaceDescriptorAddConsts
+#define XPT_InterfaceDescriptorAddMethods VBoxNsxpXPT_InterfaceDescriptorAddMethods
+#define XPT_InterfaceDescriptorAddTypes VBoxNsxpXPT_InterfaceDescriptorAddTypes
+#define XPT_GetInterfaceIndexByName VBoxNsxpXPT_GetInterfaceIndexByName
+#define XPT_NewString VBoxNsxpXPT_NewString
+#define XPT_SizeOfHeader VBoxNsxpXPT_SizeOfHeader
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 PR_BEGIN_EXTERN_C

trunk/src/libs/xpcom18a4/xpcom/typelib/xpt/public/xpt_xdr.h

@@ -44 +44 @@
 
 #include "xpt_struct.h"
+
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+#define XPT_Do8 VBoxNsxpXPT_Do8
+#define XPT_Do16 VBoxNsxpXPT_Do16
+#define XPT_Do32 VBoxNsxpXPT_Do32
+#define XPT_Do64 VBoxNsxpXPT_Do64
+#define XPT_DoIID VBoxNsxpXPT_DoIID
+#define XPT_DoCString VBoxNsxpXPT_DoCString
+#define XPT_DoString VBoxNsxpXPT_DoString
+#define XPT_DoStringInline VBoxNsxpXPT_DoStringInline
+#define XPT_NewXDRState VBoxNsxpXPT_NewXDRState
+#define XPT_SetDataOffset VBoxNsxpXPT_SetDataOffset
+#define XPT_SeekTo VBoxNsxpXPT_SeekTo
+#define XPT_MakeCursor VBoxNsxpXPT_MakeCursor
+#define XPT_DestroyXDRState VBoxNsxpXPT_DestroyXDRState
+#define XPT_GetXDRData VBoxNsxpXPT_GetXDRData
+#define XPT_GetXDRDataLength VBoxNsxpXPT_GetXDRDataLength
+#define XPT_DoHeader VBoxNsxpXPT_DoHeader
+#define XPT_DoHeaderPrologue VBoxNsxpXPT_DoHeaderPrologue
+#define XPT_UpdateFileLength VBoxNsxpXPT_UpdateFileLength
+#define XPT_DataOffset VBoxNsxpXPT_DataOffset
+#define XPT_GetOffsetForAddr VBoxNsxpXPT_GetOffsetForAddr
+#define XPT_SetOffsetForAddr VBoxNsxpXPT_SetOffsetForAddr
+#define XPT_SetAddrForOffset VBoxNsxpXPT_SetAddrForOffset
+#define XPT_GetAddrForOffset VBoxNsxpXPT_GetAddrForOffset
+#endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
 PR_BEGIN_EXTERN_C