Changeset 3573 for trunk/kStuff/kHlp/Bare/kHlpBareSem.c

Timestamp:

Aug 31, 2007, 6:09:23 AM (18 years ago)

Author:

bird

Message:

kHlp work...

Location:

trunk/kStuff/kHlp/Bare

Files:

• . (added)
• kHlpBareSem.c (moved) (moved from trunk/kStuff/kLdr/kLdrHlpSem.c ) (9 diffs)

trunk/kStuff/kHlp/Bare/kHlpBareSem.c

@@ -29 +29 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#ifdef __OS2__
+#include <k/kDefs.h>
+#include <k/kHlpSem.h>
+
+#if K_OS == K_OS_OS2
 # define INCL_BASE
 # define INCL_ERRORS
 # include <os2.h>
-#elif defined(__WIN__)
+#elif  K_OS == K_OS_WINDOWS
 # include <Windows.h>
 #else
@@ -39 +42 @@
 #endif
 
-#include <k/kLdr.h>
-#include "kLdrHlp.h"
 
 
@@ -46 +47 @@
 *   Global Variables                                                           *
 *******************************************************************************/
-#ifdef __OS2__
+#if K_OS == K_OS_OS2
 /** The loader sempahore. */
 static HMTX             g_hmtx;
 
-#elif defined(__WIN__)
+#elif  K_OS == K_OS_WINDOWS
 /** The loader sempahore. */
 static CRITICAL_SECTION g_CritSect;
@@ -63 +64 @@
  * @returns 0 on success, non-zero OS status code on failure.
  */
-int     kldrHlpSemInit(void)
+int     kHlpSemInit(void)
 {
-#ifdef __OS2__
+#if K_OS == K_OS_OS2
     APIRET rc;
     g_hmtx = NULLHANDLE;
@@ -72 +73 @@
         return rc;
 
-#elif defined(__WIN__)
+#elif  K_OS == K_OS_WINDOWS
     InitializeCriticalSection(&g_CritSect);
 
@@ -85 +86 @@
  * Terminates the loader semaphore.
  */
-void    kldrHlpSemTerm(void)
+void    kHlpSemTerm(void)
 {
-#ifdef __OS2__
+#if K_OS == K_OS_OS2
     HMTX hmtx = g_hmtx;
     g_hmtx = NULLHANDLE;
     DosCloseMutexSem(hmtx);
 
-#elif defined(__WIN__)
+#elif  K_OS == K_OS_WINDOWS
     DeleteCriticalSection(&g_CritSect);
 
@@ -107 +108 @@
  * @returns 0 on success, non-zero OS status code on failure.
  */
-int     kldrHlpSemRequest(void)
+int     kHlpSemRequest(void)
 {
-#ifdef __OS2__
+#if K_OS == K_OS_OS2
     APIRET rc = DosRequestMutexSem(g_hmtx, 5000);
     if (rc == ERROR_TIMEOUT || rc == ERROR_SEM_TIMEOUT || rc == ERROR_INTERRUPT)
@@ -125 +126 @@
     return rc;
 
-#elif defined(__WIN__)
+#elif  K_OS == K_OS_WINDOWS
     EnterCriticalSection(&g_CritSect);
     return 0;
@@ -139 +140 @@
  * The caller is responsible for making sure it's the semaphore owner!
  */
-void    kldrHlpSemRelease(void)
+void    kHlpSemRelease(void)
 {
-#ifdef __OS2__
+#if K_OS == K_OS_OS2
     APIRET rc = DosReleaseMutexSem(g_hmtx);
-    kldrHlpAssert(!rc); (void)rc;
+    kHlpAssert(!rc); (void)rc;
 
-#elif defined(__WIN__)
+#elif  K_OS == K_OS_WINDOWS
     LeaveCriticalSection(&g_CritSect);