Changeset 33393 in vbox for trunk/src/VBox/Runtime

Timestamp:

Oct 24, 2010 4:17:00 PM (14 years ago)

Author:

vboxsync

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

66982

Message:

IPRT: Some old OS/2 build fixes.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (1 diff)
• r0drv/generic/semspinmutex-r0drv-generic.c (modified) (1 diff)
• r0drv/os2/thread-r0drv-os2.cpp (modified) (1 diff)
• r3/os2/sems-os2.cpp (modified) (2 diffs)
• r3/os2/thread-os2.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1322 +1322 @@
 
 RuntimeR0_SOURCES.os2 = \
-        os2/RTErrConvertFromOS2.cpp \
         os2/sys0.asm
 

trunk/src/VBox/Runtime/r0drv/generic/semspinmutex-r0drv-generic.c

@@ -89 +89 @@
 *   Defined Constants And Macros                                               *
 *******************************************************************************/
-//#define RTSEMSPINMUTEX_INT_FLAGS_MUST
+/*#define RTSEMSPINMUTEX_INT_FLAGS_MUST*/
 
 /** Validates the handle, returning if invalid. */

trunk/src/VBox/Runtime/r0drv/os2/thread-r0drv-os2.cpp

@@ -37 +37 @@
 
 #include <iprt/asm.h>
+#include <iprt/asm-amd64-x86.h>
 #include <iprt/assert.h>
 #include <iprt/err.h>

trunk/src/VBox/Runtime/r3/os2/sems-os2.cpp

@@ -345 +345 @@
 }
 
+RTDECL(int) RTSemMutexRequestNoResumeDebug(RTSEMMUTEX hMutexSem, RTMSINTERVAL cMillies, RTHCUINTPTR uId, RT_SRC_POS_DECL)
+{
+//    RTLOCKVALSRCPOS SrcPos = RTLOCKVALSRCPOS_INIT_DEBUG_API();
+//    return rtSemMutexRequestNoResume(hMutexSem, cMillies, &SrcPos);
+    return RTSemMutexRequestNoResume(hMutexSem, cMillies);
+}
+
+
 RTDECL(int)  RTSemMutexRelease(RTSEMMUTEX hMutexSem)
 {
@@ -358 +366 @@
 
 
-RTDECL(bool) RTSemMutexIsOwned(RTSEMMUTEX hMutexSem);
+RTDECL(bool) RTSemMutexIsOwned(RTSEMMUTEX hMutexSem)
 {
     /*

trunk/src/VBox/Runtime/r3/os2/thread-os2.cpp

@@ -45 +45 @@
 #include <iprt/assert.h>
 #include <iprt/alloc.h>
-#include <iprt/asm.h>
+#include <iprt/asm-amd64-x86.h>
 #include <iprt/string.h>
 #include <iprt/err.h>