VirtualBox

Changeset 106112 in vbox for trunk/src/libs


Ignore:
Timestamp:
Sep 20, 2024 12:18:54 PM (5 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
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/libs/xpcom18a4/nsprpub/pr/include/md/_vbox.cfg

    r102226 r106112  
    4040#define nspr_vboxcfg___
    4141
    42 #include <iprt/cdefs.h>
     42#ifdef VBOX
     43# include <iprt/cdefs.h>
    4344
    4445#ifdef RT_LITTLE_ENDIAN
    … …  
    5051#else
    5152# error "Unknown endianess"
     53#endif
     54#else
     55/* Assume little endian hosts as VBox doesn't run on anything else right now. */
     56# undef IS_BIG_ENDIAN
     57# define IS_LITTLE_ENDIAN
    5258#endif
    5359

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

    r102251 r106112  
    4949#include "prtypes.h"
    5050
    51 #include <iprt/types.h>
     51#ifdef VBOX
     52# include <iprt/types.h>
     53#else
     54# include <stdint.h>
     55#endif
    5256
    5357#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
    … …  
    6064PR_BEGIN_EXTERN_C
    6165
     66#ifdef VBOX
    6267/***********************************************************************
    6368** DEFINES:     LL_MaxInt
    … …  
    9398#define LL_ZERO     LL_Zero()
    9499#define LL_MAXUINT  LL_MaxUint()
     100#endif
    95101
    96102#if PR_BYTES_PER_LONG == 8

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

    r103531 r106112  
    4141#include "prtypes.h"
    4242
    43 #include <iprt/types.h>
     43#ifdef VBOX
     44# include <iprt/types.h>
     45#endif
    4446
    4547#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
    … …  
    5961typedef struct PRMonitor PRMonitor;
    6062
     63#ifdef VBOX
    6164/*
    6265** Create a new monitor. Monitors are re-entrant locks with a single built-in
    … …  
    129132
    130133NSPR_API(PRMonitor*) PR_NewNamedMonitor(const char* name);
     134#endif
    131135
    132136PR_END_EXTERN_C

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

    r102016 r106112  
    4242#include "nsXPCOMCID.h"
    4343
    44 #include <iprt/thread.h>
     44#ifdef VBOX
     45# include <iprt/thread.h>
     46#endif
    4547
    4648#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
    … …  
    7072class nsITraceRefcnt;
    7173
     74#ifdef VBOX
    7275typedef RTTHREADINT *RTTHREAD;
    7376
    74 #ifdef VBOX
    7577/**
    7678 * Checks whether XPCOM was initialized by a call to NS_InitXPCOM2().

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

    r102210 r106112  
    3939#define nsDebug_h___
    4040
    41 #include <iprt/thread.h>
     41#ifdef VBOX
     42# include <iprt/thread.h>
     43#endif
    4244
    4345#ifndef nscore_h___
    … …  
    273275///////////////////////////////////////////////////////////////////////////////
    274276
     277#ifdef VBOX
    275278#define NS_CheckThreadSafe(owningThread, msg)                 \
    276279  NS_ASSERTION(owningThread == RTThreadSelf(), msg)
     280#endif
    277281
    278282#endif /* nsDebug_h___ */

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

    r102016 r106112  
    4646
    4747%{C++
    48 #include <iprt/thread.h>
     48#ifdef VBOX
     49# include <iprt/thread.h>
     50#else
     51typedef struct RTTHREADINT *RTTHREAD;
     52#endif
    4953
    5054// {13D86C61-00A9-11d3-9F2A-00400553EEF0}
    … …  
    105109    void stopAcceptingEvents();
    106110};
    107 

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

    r102016 r106112  
    5151#include "plevent.h"
    5252
    53 #include <iprt/thread.h>
     53#ifdef VBOX
     54# include <iprt/thread.h>
     55#else
     56typedef struct RTTHREADINT *RTTHREAD;
     57#endif
    5458
    5559/* be761f00-a3b0-11d2-996c-0080c7cb1080 */

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

    r102459 r106112  
    188188#include "prmon.h"
    189189
    190 #include <iprt/critsect.h>
    191 #include <iprt/list.h>
    192 #include <iprt/semaphore.h>
    193 #include <iprt/thread.h>
     190#ifdef VBOX
     191# include <iprt/critsect.h>
     192# include <iprt/list.h>
     193# include <iprt/semaphore.h>
     194# include <iprt/thread.h>
     195#endif
    194196
    195197#ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
    … …  
    229231typedef struct PLEventQueue PLEventQueue;
    230232
     233#ifdef VBOX
     234
    231235/*******************************************************************************
    232236 * Event Queue Operations
    … …  
    441445PL_IsQueueNative(PLEventQueue *queue);
    442446
     447#endif /* VBOX */
     448
    443449/*******************************************************************************
    444450 * Event Operations
    … …  
    461467typedef void
    462468(PR_CALLBACK *PLDestroyEventProc)(PLEvent* self);
     469
     470#ifdef VBOX
    463471
    464472/*
    … …  
    607615#endif /* XP_UNIX */
    608616
     617#endif /* VBOX */
    609618
    610619/* ----------------------------------------------------------------------- */
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette