Changeset 11780 in vbox for trunk/src

Timestamp:

Aug 28, 2008 6:33:06 PM (16 years ago)

Author:

vboxsync

Message:

API/xpcom: a bit more namespace cleanup for solaris

Location:

trunk/src/libs/xpcom18a4/nsprpub/pr

Files:

• include/private/pprthred.h (modified) (1 diff)
• src/io/prfile.c (modified) (2 diffs)
• src/pthreads/ptio.c (modified) (2 diffs)

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

@@ -85 +85 @@
 #define PR_OS2_SetFloatExcpHandler VBoxNsprPR_OS2_SetFloatExcpHandler
 #define PR_OS2_UnsetFloatExcpHandler VBoxNsprPR_OS2_UnsetFloatExcpHandler
+#define PR_XLock VBoxNsprPR_XLock
+#define PR_XUnlock VBoxNsprPR_XUnlock
+#define PR_XIsLocked VBoxNsprPR_XIsLocked
+#define PR_XWait VBoxNsprPR_XWait
+#define PR_XNotify VBoxNsprPR_XNotify
+#define PR_XNotifyAll VBoxNsprPR_XNotifyAll
 #endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 

trunk/src/libs/xpcom18a4/nsprpub/pr/src/io/prfile.c

@@ -420 +420 @@
 }
 
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+static PRInt32 PR_GetSysfdTableMax(void)
+#else /* !VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
 PRInt32 PR_GetSysfdTableMax(void)
+#endif /* !VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 {
 #if defined(XP_UNIX) && !defined(AIX) && !defined(NEXTSTEP) && !defined(QNX)
@@ -453 +457 @@
 }
 
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+static PRInt32 PR_SetSysfdTableSize(int table_size)
+#else /* !VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
 PRInt32 PR_SetSysfdTableSize(int table_size)
+#endif /* !VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 {
 #if defined(XP_UNIX) && !defined(AIX) && !defined(NEXTSTEP) && !defined(QNX)

trunk/src/libs/xpcom18a4/nsprpub/pr/src/pthreads/ptio.c

@@ -4607 +4607 @@
  */
 
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+static PRInt32 PR_GetSysfdTableMax(void)
+#else /* !VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 PRInt32 PR_GetSysfdTableMax(void)
+#endif /* !VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 {
 #if defined(XP_UNIX) && !defined(AIX) && !defined(VMS)
@@ -4621 +4625 @@
 }
 
+#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
+static PRInt32 PR_SetSysfdTableSize(PRIntn table_size)
+#else /* !VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 PRInt32 PR_SetSysfdTableSize(PRIntn table_size)
+#endif /* !VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 {
 #if defined(XP_UNIX) && !defined(AIX) && !defined(VMS)