Changeset 3584 for trunk/kStuff/kLdr/testcase/tstDllMain.c

Timestamp:

Sep 3, 2007, 12:46:37 AM (18 years ago)

Author:

bird

Message:

fixed the testcases.

File:

• trunk/kStuff/kLdr/testcase/tstDllMain.c (modified) (7 diffs)

trunk/kStuff/kLdr/testcase/tstDllMain.c

@@ -31 +31 @@
 #include "tst.h"
 
-#ifdef __OS2__
+#if K_OS == K_OS_OS2
 # define INCL_BASE
 # include <os2.h>
 # include <string.h>
 
-#elif defined(__WIN__)
+#elif K_OS == K_OS_WINDOWS
 # include <windows.h>
 # include <string.h>
 
-#elif defined(__DARWIN__)
+#elif K_OS == K_OS_DARWIN
 # include <unistd.h>
 # include <string.h>
@@ -56 +56 @@
 
 
-#ifdef __OS2__
+#if K_OS == K_OS_OS2
 /**
  * OS/2 DLL 'main'
@@ -84 +84 @@
 }
 
-#elif defined(__WIN__)
+#elif K_OS == K_OS_WINDOWS
 
 /**
@@ -125 +125 @@
 }
 
-#elif defined(__DARWIN__)
+#elif K_OS == K_OS_DARWIN
 /* later */
 
@@ -140 +140 @@
 void tstWrite(const char *pszMsg)
 {
-#if defined(__OS2__) || defined(__WIN__)
+#if K_OS == K_OS_OS2 || K_OS == K_OS_WINDOWS
     /*
      * Line by line.
@@ -151 +151 @@
         cbWritten = pszNl - pszMsg;
 
-#ifdef __OS2__
+#if K_OS == K_OS_OS2
         if (cbWritten)
             DosWrite((HFILE)2, pszMsg, cbWritten, &cbWritten);
         DosWrite((HFILE)2, "\r\n", 2, &cbWritten);
-#else /* __WIN32__ */
+#else
         if (cbWritten)
             WriteFile((HANDLE)STD_ERROR_HANDLE, pszMsg, cbWritten, &cbWritten, NULL);
@@ -172 +172 @@
     {
         cbWritten = strlen(pszMsg);
-#ifdef __OS2__
+#if K_OS == K_OS_OS2
         DosWrite((HFILE)2, pszMsg, cbWritten, &cbWritten);
-#else /* __WIN32__ */
+#else
         WriteFile((HANDLE)STD_ERROR_HANDLE, pszMsg, cbWritten, &cbWritten, NULL);
 #endif
     }
 
-#elif defined(__DARWIN__)
+#elif K_OS == K_OS_DARWIN
     write(STDERR_FILENO, pszMsg, strlen(pszMsg));