Changeset 1283 in kBuild

Timestamp:

Nov 30, 2007 2:54:36 AM (17 years ago)

Author:

bird

Message:

Use kDefs.h and kTypes.h to avoid having a zillion ways of testing for the different OSes.

Location:

trunk/src/lib

Files:

• k (added)
• k/kDefs.h (added)
• k/kTypes.h (added)
• kDep.c (modified) (7 diffs)

trunk/src/lib/kDep.c

@@ -36 +36 @@
 #include <limits.h>
 #include <sys/stat.h>
-#ifdef __WIN32__
+#include <k/kDefs.h>
+#if K_OS == K_OS_WINDOWS
 # include <windows.h>
-#endif
-#if !defined(__WIN32__) && !defined(__OS2__)
+ extern void nt_fullpath(const char *pszPath, char *pszFull, size_t cchFull); /* nt_fullpath.c */
+#else
 # include <dirent.h>
-#endif
-#ifndef __WIN32__
 # include <unistd.h>
 # include <stdint.h>
-#else
- typedef unsigned char  uint8_t;
- typedef unsigned short uint16_t;
- typedef unsigned int   uint32_t;
- extern void nt_fullpath(const char *pszPath, char *pszFull, size_t cchFull); /* nt_fullpath.c */
 #endif
 
 #include "kDep.h"
-
-#ifdef NEED_ISBLANK
-# define isblank(ch) ( (unsigned char)(ch) == ' ' || (unsigned char)(ch) == '\t' )
-#endif
-
-#define OFFSETOF(type, member)  ( (int)(void *)&( ((type *)(void *)0)->member) )
 
 
@@ -83 +71 @@
 
 
-#if defined(__OS2__)
+#if K_OS == K_OS_OS2
 
 /**
@@ -96 +84 @@
 }
 
-#elif !defined(__WIN32__) && !defined(__WIN64__)
+#elif K_OS != K_OS_WINDOWS
 
 /**
@@ -178 +166 @@
 }
 
-
-#endif
+#endif /* !OS/2 && !Windows */
 
 
@@ -195 +182 @@
     for (; pDep; pDep = pDep->pNext)
     {
-#ifdef __WIN32__
+#ifndef PATH_MAX
         char        szFilename[_MAX_PATH + 1];
 #else
@@ -211 +198 @@
         pszFilename = pDep->szFilename;
 
-#if !defined(__OS2__) && !defined(__WIN32__)
+#if K_OS != K_OS_OS2 && K_OS != K_OS_WINDOWS
         /*
          * Skip any drive letters from compilers running in wine.
@@ -225 +212 @@
         if (fFixCase)
         {
-#if defined(__WIN32__) || defined(__WIN64__)
+#if K_OS == K_OS_WINDOWS
             nt_fullpath(pszFilename, szFilename, sizeof(szFilename));
 #else