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

Timestamp:

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

Author:

bird

Message:

WIN* DARWIN and OS2 removal.

File:

• trunk/kStuff/kLdr/kLdrDyldFind.c (modified) (8 diffs)

trunk/kStuff/kLdr/kLdrDyldFind.c

@@ -30 +30 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#ifdef __OS2__
+#include <k/kLdr.h>
+#include "kLdrInternal.h"
+
+#if K_OS == K_OS_OS2
 # define INCL_BASE
 # define INCL_ERRORS
@@ -47 +50 @@
 # define QHINF_MAPSEL        8 /* NE only */
 
-#elif defined(__WIN__)
+#elif K_OS == K_OS_WINDOWS
+# undef IMAGE_DOS_SIGNATURE
+# undef IMAGE_NT_SIGNATURE
 # include <Windows.h>
+
 #endif
-
-#include <k/kLdr.h>
-#include "kLdrInternal.h"
 
 
@@ -236 +239 @@
      * The OS/2 search parameters.
      */
-#ifdef __OS2__
+#if K_OS == K_OS_OS2
     rc = DosQueryHeaderInfo(NULLHANDLE, 0, kLdrDyldOS2Libpath, sizeof(kLdrDyldOS2Libpath), QHINF_LIBPATH);
     if (rc)
@@ -266 +269 @@
      * The windows search parameters.
      */
-#if defined(__WIN__)
+#if K_OS == K_OS_WINDOWS
     cch = GetSystemDirectory(kLdrDyldWindowsSystemDir, sizeof(kLdrDyldWindowsSystemDir));
     if (cch >= sizeof(kLdrDyldWindowsSystemDir))
@@ -320 +323 @@
 
 
-#elif defined(__WIN__)
+#elif K_OS == K_OS_WINDOWS
         DWORD dwSize = GetModuleFileName(NULL /* the executable */, kLdrDyldAppDir, sizeof(kLdrDyldAppDir));
         if (dwSize > 0)
@@ -665 +668 @@
     psz = &s_szFilename[cchPath];
     if (psz[-1] != '/'
-#if defined(__OS2__) || defined(__WIN__)
+#if K_OS == K_OS_OS2 || K_OS == K_OS_WINDOWS
         && psz[-1] != '\\'
         && psz[-1] != ':'
@@ -737 +740 @@
         while (     *pszEnd != '\0'
                &&   *pszEnd != ';'
-#if defined(__OS2__) || defined(__WIN__)
+#if K_OS == K_OS_OS2 || K_OS == K_OS_WINDOWS
                && (     *pszEnd != ':'
                    ||   (   pszEnd - psz == 1
@@ -790 +793 @@
 #if defined(__OS2__)
         *penmSearch = KLDRDYLD_SEARCH_OS2;
-#elif defined(__WIN__)
+#elif K_OS == K_OS_WINDOWS
         *penmSearch = KLDRDYLD_SEARCH_WINDOWS;
 #else