Changeset 106112 in vbox for trunk/src/libs/xpcom18a4/xpcom

Timestamp:

Sep 20, 2024 12:18:54 PM (8 months ago)

Author:

vboxsync

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

164888

Message:

libs/xpcom: Fix building code using the XPCOM SDK bindings outside of VirtualBox, ticketref:22714 bugref:10773

Location:

trunk/src/libs/xpcom18a4/xpcom

Files:

• build/nsXPCOM.h (modified) (2 diffs)
• glue/nsDebug.h (modified) (2 diffs)
• threads/nsIEventQueue.idl (modified) (2 diffs)
• threads/nsIEventQueueService.idl (modified) (1 diff)
• threads/plevent.h (modified) (5 diffs)

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

@@ -42 +42 @@
 #include "nsXPCOMCID.h"
 
-#include <iprt/thread.h>
+#ifdef VBOX
+# include <iprt/thread.h>
+#endif
 
 #ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
@@ -70 +72 @@
 class nsITraceRefcnt;
 
+#ifdef VBOX
 typedef RTTHREADINT *RTTHREAD;
 
-#ifdef VBOX
 /**
  * Checks whether XPCOM was initialized by a call to NS_InitXPCOM2().

trunk/src/libs/xpcom18a4/xpcom/glue/nsDebug.h

@@ -39 +39 @@
 #define nsDebug_h___
 
-#include <iprt/thread.h>
+#ifdef VBOX
+# include <iprt/thread.h>
+#endif
 
 #ifndef nscore_h___
@@ -273 +275 @@
 ///////////////////////////////////////////////////////////////////////////////
 
+#ifdef VBOX
 #define NS_CheckThreadSafe(owningThread, msg)                 \
   NS_ASSERTION(owningThread == RTThreadSelf(), msg)
+#endif
 
 #endif /* nsDebug_h___ */

trunk/src/libs/xpcom18a4/xpcom/threads/nsIEventQueue.idl

@@ -46 +46 @@
 
 %{C++
-#include <iprt/thread.h>
+#ifdef VBOX
+# include <iprt/thread.h>
+#else
+typedef struct RTTHREADINT *RTTHREAD;
+#endif
 
 // {13D86C61-00A9-11d3-9F2A-00400553EEF0}
@@ -105 +109 @@
     void stopAcceptingEvents();
 };
-

trunk/src/libs/xpcom18a4/xpcom/threads/nsIEventQueueService.idl

@@ -51 +51 @@
 #include "plevent.h"
 
-#include <iprt/thread.h>
+#ifdef VBOX
+# include <iprt/thread.h>
+#else
+typedef struct RTTHREADINT *RTTHREAD;
+#endif
 
 /* be761f00-a3b0-11d2-996c-0080c7cb1080 */

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

@@ -188 +188 @@
 #include "prmon.h"
 
-#include <iprt/critsect.h>
-#include <iprt/list.h>
-#include <iprt/semaphore.h>
-#include <iprt/thread.h>
+#ifdef VBOX
+# include <iprt/critsect.h>
+# include <iprt/list.h>
+# include <iprt/semaphore.h>
+# include <iprt/thread.h>
+#endif
 
 #ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
@@ -229 +231 @@
 typedef struct PLEventQueue PLEventQueue;
 
+#ifdef VBOX
+
 /*******************************************************************************
  * Event Queue Operations
@@ -441 +445 @@
 PL_IsQueueNative(PLEventQueue *queue);
 
+#endif /* VBOX */
+
 /*******************************************************************************
  * Event Operations
@@ -461 +467 @@
 typedef void
 (PR_CALLBACK *PLDestroyEventProc)(PLEvent* self);
+
+#ifdef VBOX
 
 /*
@@ -607 +615 @@
 #endif /* XP_UNIX */
 
+#endif /* VBOX */
 
 /* ----------------------------------------------------------------------- */