Changeset 13908
- Timestamp:
- 11/06/08 12:53:47 (2 months ago)
- Files:
-
- trunk/Config.kmk (modified) (3 diffs)
- trunk/Makefile.kmk (modified) (1 diff)
- trunk/include/VBox/com/array.h (modified) (2 diffs)
- trunk/include/VBox/com/defs.h (modified) (1 diff)
- trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h (modified) (1 diff)
- trunk/src/VBox/Frontends/VBoxManage/VBoxManageSVN.cpp (modified) (1 diff)
- trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (2 diffs)
- trunk/src/VBox/Frontends/VirtualBox/src/QIWidgetValidator.cpp (modified) (2 diffs)
- trunk/src/VBox/Frontends/VirtualBox/src/VBoxMediaComboBox.cpp (modified) (1 diff)
- trunk/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp (modified) (2 diffs)
- trunk/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp (modified) (1 diff)
- trunk/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.cpp (modified) (1 diff)
- trunk/src/VBox/Main/ConsoleImpl.cpp (modified) (2 diffs)
- trunk/src/VBox/Main/HostPower.cpp (modified) (1 diff)
- trunk/src/VBox/Main/MachineImpl.cpp (modified) (1 diff)
- trunk/src/VBox/Main/Makefile.kmk (modified) (2 diffs)
- trunk/src/VBox/Main/ProgressImpl.cpp (modified) (2 diffs)
- trunk/src/VBox/Main/glue/com.cpp (modified) (2 diffs)
- trunk/src/VBox/Main/glue/initterm.cpp (modified) (2 diffs)
- trunk/src/VBox/Main/include/Performance.h (modified) (1 diff)
- trunk/src/VBox/Main/testcase/tstCollector.cpp (modified) (2 diffs)
- trunk/src/VBox/Main/xpcom/server.cpp (modified) (1 diff)
- trunk/src/VBox/Main/xpcom/server.h (modified) (1 diff)
- trunk/src/VBox/Runtime/Makefile.kmk (modified) (1 diff)
- trunk/src/VBox/Runtime/common/misc/thread.cpp (modified) (1 diff)
- trunk/src/VBox/Runtime/generic/RTMpCpuIdToSetIndex-generic.cpp (modified) (1 diff)
- trunk/src/VBox/Runtime/generic/RTRandAdvCreateSystemFaster-generic.cpp (modified) (1 diff)
- trunk/src/VBox/Runtime/generic/RTRandAdvCreateSystemTruer-generic.cpp (modified) (1 diff)
- trunk/src/VBox/Runtime/r0drv/powernotification-r0drv.c (modified) (3 diffs)
- trunk/src/VBox/Runtime/r3/os2/mp-os2.cpp (modified) (1 diff)
- trunk/src/VBox/Runtime/r3/os2/rtProcInitExePath-os2.cpp (modified) (1 diff)
- trunk/src/VBox/VMM/VMMAll/EMAllA.asm (modified) (2 diffs)
- trunk/src/VBox/VMM/VMMR0/HWACCMR0A.asm (modified) (1 diff)
- trunk/src/libs/xpcom18a4/Makefile.kmk (modified) (2 diffs)
- trunk/src/libs/xpcom18a4/nsprpub/pr/src/io/prfile.c (modified) (2 diffs)
- trunk/src/libs/xpcom18a4/nsprpub/pr/src/md/os2/os2rng.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/Config.kmk
r13859 r13908 142 142 else ifeq ($(KBUILD_TARGET),solaris) 143 143 VBOX_PACKAGE_OS = SOLARIS 144 else ifeq ($(KBUILD_TARGET),os2) 145 VBOX_PACKAGE_OS = OS2 144 146 else if1of ($(KBUILD_TARGET), dragonfly freebsd netbsd openbsd) 145 147 VBOX_PACKAGE_OS = BSD … … 1164 1166 LIB_DDU = $(PATH_BIN)/VBoxDDU.dll 1165 1167 LIB_SETTINGS = $(PATH_BIN)/VBoxSett.dll 1166 OBJ_SYS0 = $(PATH_OBJ)/ src/VBox/Runtime/RuntimeR0/os2/sys0.obj1168 OBJ_SYS0 = $(PATH_OBJ)/RuntimeR0/os2/sys0.obj 1167 1169 endif 1168 1170 ifeq ($(KBUILD_TARGET),win) … … 1716 1718 # 1717 1719 ## @todo convert this into SDK and integrate the Qt stuff into kBuild. 1720 ## @todo remove this section when win and darwin cases are moved to kBuild/units/qt3.kmk. 1721 ## vbox/Makefile.kmk that uses VBX_DLL_QT and others needs to be corrected too 1718 1722 ifeq ($(KBUILD_TARGET),win) 1719 1723 VBOX_PATH_QT ?= $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v3.*))) trunk/Makefile.kmk
r13893 r13908 90 90 ifneq ($(VBOX_WITH_QTGUI),) 91 91 if1of ($(KBUILD_TARGET), win os2) 92 #include $(KBUILD_PATH)/sdks/QT3.kmk 93 #bin_SOURCES += \ 94 # $(DLL_SDK_QT3_QT) 95 ifneq ($(strip $(VBOX_DLL_QT)),) 92 ## @todo remove ifeq and make it work for win too (see 93 ifeq ($(KBUILD_TARGET),os2) 94 include $(KBUILD_PATH)/units/qt3.kmk 96 95 bin_SOURCES += \ 97 $(VBOX_DLL_QT)=>$(not-dir $(VBOX_DLL_QT)) 96 $(DLL_SDK_QT3_QT)=>$(not-dir $(DLL_SDK_QT3_QT)) 97 else 98 ifneq ($(strip $(VBOX_DLL_QT)),) 99 bin_SOURCES += \ 100 $(VBOX_DLL_QT)=>$(not-dir $(VBOX_DLL_QT)) 101 endif 98 102 endif 99 103 ifdef VBOX_QT_BINARIES trunk/include/VBox/com/array.h
r13856 r13908 32 32 #define ___VBox_com_array_h 33 33 34 #include <VBox/com/ptr.h>35 36 34 /** @defgroup grp_COM_arrays COM/XPCOM Arrays 37 35 * @{ … … 168 166 169 167 #if defined (VBOX_WITH_XPCOM) 170 # include <nsMemory.h>168 # include <nsMemory.h> 171 169 #endif 172 170 173 171 #include "VBox/com/defs.h" 172 #include "VBox/com/ptr.h" 174 173 #include "VBox/com/assert.h" 175 174 trunk/include/VBox/com/defs.h
r13580 r13908 41 41 42 42 #if defined (RT_OS_OS2) 43 44 #if defined(RT_MAX) && RT_MAX != 22 45 # error RT_MAX already defined by <iprt/cdefs.h>! Make sure <VBox/com/defs.h> \ 46 is included before it. 47 #endif 43 48 44 49 /* Make sure OS/2 Toolkit headers are pulled in to have BOOL/ULONG/etc. typedefs trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h
r13580 r13908 23 23 #define ___H_VBOXMANAGE 24 24 25 #include <iprt/types.h>26 25 #ifndef VBOX_ONLY_DOCS 27 26 #include <VBox/com/ptr.h> 28 27 #include <VBox/com/VirtualBox.h> 29 28 #endif /* !VBOX_ONLY_DOCS */ 29 30 #include <iprt/types.h> 30 31 31 32 /** @name Syntax diagram category. trunk/src/VBox/Frontends/VBoxManage/VBoxManageSVN.cpp
r8155 r13908 21 21 */ 22 22 23 #include "VBoxManage.h" 24 23 25 #include <VBox/version.h> 24 #include "VBoxManage.h"25 26 26 27 /** trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk
r13547 r13908 64 64 # Hack for installing the qt.dll when building for OS/2. 65 65 # 66 ifneq ($(strip $( VBOX_DLL_QT)),)66 ifneq ($(strip $(DLL_SDK_QT3_QT)),) 67 67 INSTALLS.os2 += qt.dll 68 68 qt.dll_INST = $(INST_BIN) 69 69 qt.dll_SOURCES += \ 70 $( VBOX_DLL_QT)=>$(not-dir $(VBOX_DLL_QT))70 $(DLL_SDK_QT3_QT)=>$(not-dir $(DLL_SDK_QT3_QT)) 71 71 endif 72 72 endif # OS/2 … … 339 339 340 340 VirtualBox_INCS = \ 341 . \ 341 342 ./include \ 342 343 $(PATH_VirtualBox)/include trunk/src/VBox/Frontends/VirtualBox/src/QIWidgetValidator.cpp
r8170 r13908 23 23 #include "QIWidgetValidator.h" 24 24 25 #include "VBoxGlobal.h" 26 25 27 #include <qobjectlist.h> 26 28 #include <qlineedit.h> … … 29 31 30 32 #include <iprt/assert.h> 31 32 #include "VBoxGlobal.h"33 33 34 34 /** @class QIWidgetValidator trunk/src/VBox/Frontends/VirtualBox/src/VBoxMediaComboBox.cpp
r13580 r13908 107 107 QUuid VBoxMediaComboBox::id (int aIndex /*= -1*/) 108 108 { 109 #if (__GNUC__ * 100 + __GNUC_MINOR__) >= 304 109 110 AssertReturn (aIndex == -1 || 110 111 (aIndex >= 0 && (size_t) aIndex < mMedia.size()), 111 112 QUuid()); 113 #else 114 static QUuid null; 115 AssertReturn (aIndex == -1 || 116 (aIndex >= 0 && (size_t) aIndex < mMedia.size()), 117 null); 118 #endif 112 119 113 120 return mMedia [aIndex == -1 ? currentItem() : aIndex].id; trunk/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp
r13503 r13908 37 37 # include <os2.h> 38 38 # include <stdio.h> 39 # include <stdlib.h> 40 # include <dlfcn.h> 39 41 40 42 #elif RT_OS_WINDOWS … … 86 88 */ 87 89 #ifdef RT_OS_OS2 88 # define SUP_HARDENED_SYM(sym) "_" ##sym90 # define SUP_HARDENED_SYM(sym) "_" sym 89 91 #else 90 92 # define SUP_HARDENED_SYM(sym) sym trunk/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp
r13637 r13908 37 37 # include <os2.h> 38 38 # include <stdio.h> 39 # include <stdlib.h> 40 # include <unistd.h> 41 # include <sys/fcntl.h> 42 # include <sys/errno.h> 43 # include <sys/syslimits.h> 39 44 40 45 #elif defined(RT_OS_WINDOWS) trunk/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.cpp
r13862 r13908 375 375 } 376 376 377 378 bool VBOXCALL supdrvOSGetForcedAsyncTscMode(PSUPDRVDEVEXT pDevExt) 379 { 380 NOREF(pDevExt); 381 return false; 382 } 383 384 377 385 /** 378 386 * Callback for writing to the log buffer. trunk/src/VBox/Main/ConsoleImpl.cpp
r13878 r13908 21 21 * additional information or have any questions. 22 22 */ 23 24 #include <iprt/types.h> /* for stdint.h constants */25 23 26 24 #if defined(RT_OS_WINDOWS) … … 63 61 64 62 #include <VBox/com/array.h> 63 64 #include <iprt/types.h> /* for stdint.h constants */ 65 65 66 66 #include <iprt/string.h> trunk/src/VBox/Main/HostPower.cpp
r13713 r13908 24 24 * Header Files * 25 25 *******************************************************************************/ 26 #include <iprt/mem.h> 27 #include <VBox/com/ptr.h> 26 28 27 #include "HostPower.h" 29 28 #include "Logging.h" 29 30 #include <VBox/com/ptr.h> 31 32 #include <iprt/mem.h> 30 33 31 34 HostPowerService::HostPowerService (VirtualBox *aVirtualBox) trunk/src/VBox/Main/MachineImpl.cpp
r13842 r13908 3882 3882 ComPtr <IInternalSessionControl> *aControl /*= NULL*/, 3883 3883 HMTX *aIPCSem /*= NULL*/, 3884 bool aAllowClosing /*= false*/) ;3884 bool aAllowClosing /*= false*/) 3885 3885 #else 3886 3886 bool Machine::isSessionOpen (ComObjPtr <SessionMachine> &aMachine, trunk/src/VBox/Main/Makefile.kmk
r13886 r13908 606 606 $(QUIET)$(VBOX_XSLTPROC) -o $@ $< $(VBOX_XIDL_FILE) 607 607 608 $(VBOX_IDL_TYPELIB.XPCOM): $(VBOX_IDL_FILE.XPCOM) | $$(dir $$@) $( VBOX_XPIDL)608 $(VBOX_IDL_TYPELIB.XPCOM): $(VBOX_IDL_FILE.XPCOM) | $$(dir $$@) $(lastword $(VBOX_XPIDL)) 609 609 $(call MSG_TOOL,xpidl,VBoxSVC,$<,$@) 610 610 $(QUIET)$(VBOX_XPIDL) -m typelib -I $(VBOX_PATH_XPCOM_IDL) -e $@ $< … … 612 612 ## @todo ^^^^^^^^^^^^ fix horrible hack 613 613 614 $(VBOX_IDL_HEADER.XPCOM): $(VBOX_IDL_FILE.XPCOM) | $$(dir $$@) $( VBOX_XPIDL)614 $(VBOX_IDL_HEADER.XPCOM): $(VBOX_IDL_FILE.XPCOM) | $$(dir $$@) $(lastword $(VBOX_XPIDL)) 615 615 $(call MSG_TOOL,xpidl,VBoxSVC,$<,$@) 616 616 $(QUIET)$(VBOX_XPIDL) -m header -I $(VBOX_PATH_XPCOM_IDL) -e $@ $< trunk/src/VBox/Main/ProgressImpl.cpp
r13837 r13908 21 21 */ 22 22 23 #include <iprt/types.h>24 25 23 #if defined (VBOX_WITH_XPCOM) 26 24 #include <nsIServiceManager.h> … … 36 34 #include "Logging.h" 37 35 36 #include <iprt/types.h> 38 37 #include <iprt/time.h> 39 38 #include <iprt/semaphore.h> trunk/src/VBox/Main/glue/com.cpp
r13580 r13908 37 37 #endif /* !defined (VBOX_WITH_XPCOM) */ 38 38 39 #include "VBox/com/com.h" 40 #include "VBox/com/assert.h" 41 42 #include "VBox/com/Guid.h" 43 #include "VBox/com/array.h" 44 39 45 #include <iprt/param.h> 40 46 #include <iprt/path.h> … … 44 50 45 51 #include <VBox/err.h> 46 47 #include "VBox/com/com.h"48 #include "VBox/com/assert.h"49 50 #include "VBox/com/Guid.h"51 #include "VBox/com/array.h"52 52 53 53 trunk/src/VBox/Main/glue/initterm.cpp
r8155 r13908 49 49 #endif /* !defined (VBOX_WITH_XPCOM) */ 50 50 51 #include "VBox/com/com.h" 52 #include "VBox/com/assert.h" 53 54 #include "../include/Logging.h" 55 51 56 #include <iprt/param.h> 52 57 #include <iprt/path.h> … … 56 61 57 62 #include <VBox/err.h> 58 59 #include "VBox/com/com.h"60 #include "VBox/com/assert.h"61 62 #include "../include/Logging.h"63 63 64 64 namespace com trunk/src/VBox/Main/include/Performance.h
r12973 r13908 23 23 24 24 25 #include <iprt/types.h>26 25 #include <VBox/com/defs.h> 27 26 #include <VBox/com/ptr.h> 27 28 #include <iprt/types.h> 29 #include <iprt/err.h> 30 28 31 #include <algorithm> 29 32 #include <list> trunk/src/VBox/Main/testcase/tstCollector.cpp
r13837 r13908 22 22 */ 23 23 24 #ifdef RT_OS_SOLARIS 25 #include "../solaris/PerformanceSolaris.cpp" 26 #endif 27 #ifdef RT_OS_LINUX 28 #include "../linux/PerformanceLinux.cpp" 29 #endif 30 #ifdef RT_OS_WINDOWS 31 #define _WIN32_DCOM 32 #include <objidl.h> 33 #include <objbase.h> 34 #include "../win/PerformanceWin.cpp" 35 #endif 36 #ifdef RT_OS_OS2 37 #include "../os2/PerformanceOS2.cpp" 38 #endif 39 #ifdef RT_OS_DARWIN 40 #include "../darwin/PerformanceDarwin.cpp" 41 #endif 42 24 43 #include <iprt/runtime.h> 25 44 #include <iprt/stream.h> … … 27 46 #include <iprt/err.h> 28 47 #include <iprt/process.h> 29 30 #ifdef RT_OS_SOLARIS31 #include "../solaris/PerformanceSolaris.cpp"32 #endif33 #ifdef RT_OS_LINUX34 #include "../linux/PerformanceLinux.cpp"35 #endif36 #ifdef RT_OS_WINDOWS37 #define _WIN32_DCOM38 #include <objidl.h>39 #include <objbase.h>40 #include "../win/PerformanceWin.cpp"41 #endif42 #ifdef RT_OS_OS243 #include "../os2/PerformanceOS2.cpp"44 #endif45 #ifdef RT_OS_DARWIN46 #include "../darwin/PerformanceDarwin.cpp"47 #endif48 48 49 49 #define RUN_TIME_MS 1000 trunk/src/VBox/Main/xpcom/server.cpp
r13837 r13908 44 44 #include "Logging.h" 45 45 46 #include <VBox/param.h> 47 #include <VBox/version.h> 48 46 49 #include <iprt/runtime.h> 47 50 #include <iprt/path.h> 48 51 #include <iprt/critsect.h> 49 52 #include <iprt/timer.h> 50 51 #include <VBox/param.h>52 #include <VBox/version.h>53 54 #include <VBox/com/com.h>55 53 56 54 #include <stdio.h> trunk/src/VBox/Main/xpcom/server.h
r8768 r13908 23 23 #define ____H_LINUX_SERVER 24 24 25 #include <VBox/com/com.h> 26 25 27 #include <VBox/version.h> 26 28 trunk/src/VBox/Runtime/Makefile.kmk
r13547 r13908 1132 1132 \ 1133 1133 common/misc/thread.cpp \ 1134 generic/RTAssertShouldPanic-generic.cpp \ 1134 1135 generic/RTLogWriteDebugger-generic.cpp \ 1135 1136 generic/RTLogWriteStdOut-stub-generic.cpp \ trunk/src/VBox/Runtime/common/misc/thread.cpp
r13837 r13908 422 422 { 423 423 PRTTHREADINT pThread2 = (PRTTHREADINT)RTAvlPVRemove(&g_ThreadTree, pThread->Core.Key); 424 #if !defined(RT_OS_OS2) 425 /// @todo this asserts for threads created by NSPR 424 426 AssertMsg(pThread2 == pThread, ("%p(%s) != %p (%p/%s)\n", pThread2, pThread2 ? pThread2->szName : "<null>", 425 427 pThread, pThread->Core.Key, pThread->szName)); 428 #endif 426 429 NOREF(pThread2); 427 430 } trunk/src/VBox/Runtime/generic/RTMpCpuIdToSetIndex-generic.cpp
r8245 r13908 38 38 RTDECL(int) RTMpCpuIdToSetIndex(RTCPUID idCpu) 39 39 { 40 return idCpu != NIL_RTCPUID ? idCpu : -1;40 return idCpu != NIL_RTCPUID ? (int) idCpu : -1; 41 41 } 42 42 trunk/src/VBox/Runtime/generic/RTRandAdvCreateSystemFaster-generic.cpp
r11557 r13908 36 36 37 37 38 RTDECL(int) RTRandAdvCreateSystemFaster(PRTRAND phRand) 38 RTDECL(int) RTRandAdvCreateSystemFaster(PRTRAND phRand) RT_NO_THROW 39 39 { 40 40 NOREF(phRand); trunk/src/VBox/Runtime/generic/RTRandAdvCreateSystemTruer-generic.cpp
r11557 r13908 36 36 37 37 38 RTDECL(int) RTRandAdvCreateSystemTruer(PRTRAND phRand) 38 RTDECL(int) RTRandAdvCreateSystemTruer(PRTRAND phRand) RT_NO_THROW 39 39 { 40 40 NOREF(phRand); trunk/src/VBox/Runtime/r0drv/powernotification-r0drv.c
r13489 r13908 275 275 int rc = VINF_SUCCESS; 276 276 277 if (ASMAtomicInc S32(&g_cRTPowerUsers) == 1)277 if (ASMAtomicIncU32(&g_cRTPowerUsers) == 1) 278 278 { 279 279 rc = RTSpinlockCreate((PRTSPINLOCK)&g_hRTPowerNotifySpinLock); … … 287 287 #endif 288 288 } 289 ASMAtomicDec S32(&g_cRTPowerUsers);289 ASMAtomicDecU32(&g_cRTPowerUsers); 290 290 } 291 291 return rc; … … 299 299 { 300 300 AssertMsg(g_cRTPowerUsers > 0, ("%d\n", g_cRTPowerUsers)); 301 if (ASMAtomicDec S32(&g_cRTPowerUsers) == 0)301 if (ASMAtomicDecU32(&g_cRTPowerUsers) == 0) 302 302 { 303 303 PRTPOWERNOTIFYREG pHead; trunk/src/VBox/Runtime/r3/os2/mp-os2.cpp
r9429 r13908 46 46 RTDECL(int) RTMpCpuIdToSetIndex(RTCPUID idCpu) 47 47 { 48 return idCpu < RTCPUSET_MAX_CPUS ? idCpu : -1;48 return idCpu < RTCPUSET_MAX_CPUS ? (int) idCpu : -1; 49 49 } 50 50 trunk/src/VBox/Runtime/r3/os2/rtProcInitExePath-os2.cpp
r11838 r13908 54 54 char *pszTmp; 55 55 int rc = rtPathFromNative(&pszTmp, pszPath); 56 AssertMsgRCReturn(rc, ("rc=%Rrc pszLink=\"%s\"\nhex: %.*Rhsx\n", rc, pszPath, cch ImageName, pszPath), rc);56 AssertMsgRCReturn(rc, ("rc=%Rrc pszLink=\"%s\"\nhex: %.*Rhsx\n", rc, pszPath, cchPath, pszPath), rc); 57 57 58 58 size_t cch = strlen(pszTmp); trunk/src/VBox/VMM/VMMAll/EMAllA.asm
r13832 r13908 1068 1068 %endif 1069 1069 1070 %ifdef RT_OS_OS2 1071 lock cmpxchg8b [xBP] ; do CMPXCHG8B 1072 %else 1070 1073 lock cmpxchg8b qword [xBP] ; do CMPXCHG8B 1074 %endif 1075 1071 1076 %ifdef RT_ARCH_AMD64 1072 1077 %ifdef RT_OS_WINDOWS … … 1134 1139 %endif 1135 1140 1141 %ifdef RT_OS_OS2 1142 cmpxchg8b [xBP] ; do CMPXCHG8B 1143 %else 1136 1144 cmpxchg8b qword [xBP] ; do CMPXCHG8B 1145 %endif 1137 1146 1138 1147 %ifdef RT_ARCH_AMD64 trunk/src/VBox/VMM/VMMR0/HWACCMR0A.asm
r13279 r13908 838 838 ;DECLASM(int) VMXGetActivateVMCS(RTHCPHYS *pVMCS); 839 839 BEGINPROC VMXGetActivateVMCS 840 %ifdef RT_ARCH_AMD64 841 %ifdef ASM_CALL64_GCC 840 %ifdef RT_OS_OS2 841 mov eax, VERR_NOT_SUPPORTED 842 ret 843 %else 844 %ifdef RT_ARCH_AMD64 845 %ifdef ASM_CALL64_GCC 842 846 vmptrst qword [rdi] 847 %else 848 vmptrst qword [rcx] 849 %endif 843 850 %else 844 vmptrst qword [ rcx]851 vmptrst qword [esp+04h] 845 852 %endif 846 %else847 vmptrst qword [esp+04h]848 %endif849 853 xor eax, eax 850 854 ret 855 %endif 851 856 ENDPROC VMXGetActivateVMCS 852 857 trunk/src/libs/xpcom18a4/Makefile.kmk
r13805 r13908 640 640 # install necessary DLLs to the same place where xpidl goes 641 641 INSTALLS += xpidl-DLLS 642 xpidl_ORDERDEPS = xpidl-DLLS642 xpidl_ORDERDEPS = $(TARGET_xpidl-DLLS) 643 643 xpidl-DLLS_INST = $(xpidl_INST) 644 644 # static libraries of these may be provided instead, … … 1748 1748 # INSTARGET_xpidl which is the one in bin/. 1749 1749 # 1750 $( VBOX_XPIDL): $$(PATH_VBox-xpcom-string)/idl_ts1750 $(lastword $(VBOX_XPIDL)): $$(PATH_VBox-xpcom-string)/idl_ts 1751 1751 1752 1752 trunk/src/libs/xpcom18a4/nsprpub/pr/src/io/prfile.c
r11780 r13908 422 422 #ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP 423 423 static PRInt32 PR_GetSysfdTableMax(void) 424 #else /* !VBOX_WITH_XPCOM_NAMESPACE_CLEANUP 424 #else /* !VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */ 425 425 PRInt32 PR_GetSysfdTableMax(void) 426 426 #endif /* !VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */ … … 459 459 #ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP 460 460 static PRInt32 PR_SetSysfdTableSize(int table_size) 461 #else /* !VBOX_WITH_XPCOM_NAMESPACE_CLEANUP 461 #else /* !VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */ 462 462 PRInt32 PR_SetSysfdTableSize(int table_size) 463 463 #endif /* !VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */ trunk/src/libs/xpcom18a4/nsprpub/pr/src/md/os2/os2rng.c
r1 r13908 41 41 #include <os2.h> 42 42 #include <stdlib.h> 43 #include <memory.h> 43 44 #include <time.h> 44 45 #include "primpl.h"

