Changeset 3582 for trunk/kStuff/kLdr/kLdrDyldOS.c

Timestamp:

Sep 3, 2007, 12:26:42 AM (18 years ago)

Author:

bird

Message:

WIN* DARWIN and OS2 removal.

File:

• trunk/kStuff/kLdr/kLdrDyldOS.c (modified) (4 diffs)

trunk/kStuff/kLdr/kLdrDyldOS.c

@@ -29 +29 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#ifdef __OS2__
+#include <k/kLdr.h>
+#include "kLdrInternal.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
+# undef IMAGE_DOS_SIGNATURE
+# undef IMAGE_NT_SIGNATURE
 # include <Windows.h>
+
 #else
 # error "port me"
 #endif
-
-#include <k/kLdr.h>
-#include "kLdrInternal.h"
 
 
@@ -52 +56 @@
 void *kldrDyldOSAllocStack(KSIZE cb)
 {
-#ifdef __OS2__
+#if K_OS == K_OS_OS2
     APIRET rc;
     PVOID pv;
@@ -64 +68 @@
     return NULL;
 
-#elif defined(__WIN__)
+#elif K_OS == K_OS_WINDOWS
 
     if (!cb)
@@ -90 +94 @@
 #if defined(__OS2__)
 
-#elif defined(__WIN__)
+#elif K_OS == K_OS_WINDOWS
     /*
      * Invoke the entrypoint on the current stack for now.