Fixed undefined macro warnings in CDT.

When compiling with all warnings on Windows, various "'MACRO_NAME is not
defined as a preprocessor macro, replacing with '0' for '#if/#elif'"
warnings where thrown. This commit fixes those warnings by placing
defined() around the macro names.

diff --git a/lib/cdt/cdt.h b/lib/cdt/cdt.h
index 1b6369147620095f3797135d24fe68bb651c4c01..e19404e1270cd4738307be1d23914cfa910b95aa 100644 (file)
--- a/lib/cdt/cdt.h
+++ b/lib/cdt/cdt.h
@@ -32,7 +32,7 @@
 #endif
 
 
-#if !_DLL_BLD && _dll_import
+#if !defined(_DLL_BLD) && defined(_dll_import)
 #define __EXTERN__(T,obj)       extern T obj; T* _imp__ ## obj = &obj
 #define __DEFINE__(T,obj,val)   T obj = val; T* _imp__ ## obj = &obj
 #else

diff --git a/lib/cdt/dthdr.h b/lib/cdt/dthdr.h
index 8ad87855d7a9b21dd38729fa16b5f1c3ebb358a5..a1dd81d8eee117e9cb259e50962e188a47a3e7c9 100644 (file)
--- a/lib/cdt/dthdr.h
+++ b/lib/cdt/dthdr.h
@@ -8,7 +8,7 @@
 **     Written by Kiem-Phong Vo (5/25/96)
 */
 
-#if _PACKAGE_ast
+#if defined(_PACKAGE_ast)
 #include       <ast.h>
 #else
 #include       <ast_common.h>
@@ -54,7 +54,7 @@
 #define RROTATE(x,y)   (rrotate(x,y), (x) = (y))
 #define LROTATE(x,y)   (lrotate(x,y), (x) = (y))
 
-#if !_PACKAGE_ast
+#if !defined(_PACKAGE_ast)
 _BEGIN_EXTERNS_
 extern Void_t* malloc _ARG_((size_t));
 extern Void_t* realloc _ARG_((Void_t*, size_t));

diff --git a/windows/include/ast_common.h b/windows/include/ast_common.h
index 6b4946480d8c15bf73a17cc0273c96e8f8f64d45..70ef7a5baf3492b582644044f8abdd900d30ba76 100644 (file)
--- a/windows/include/ast_common.h
+++ b/windows/include/ast_common.h
@@ -27,13 +27,13 @@
 #define _proto_stdc    1       /* Standard-C prototypes ok */
 
 /* __STD_C indicates that the language is ANSI-C or C++ */
-#if !defined(__STD_C) && __STDC__
+#if !defined(__STD_C) && defined(__STDC__)
 #define        __STD_C         1
 #endif
-#if !defined(__STD_C) && (__cplusplus || c_plusplus)
+#if !defined(__STD_C) && (defined(__cplusplus) || defined(c_plusplus))
 #define __STD_C                1
 #endif
-#if !defined(__STD_C) && _proto_stdc
+#if !defined(__STD_C) && defined(_proto_stdc)
 #define __STD_C                1
 #endif
 #if !defined(__STD_C)
@@ -42,7 +42,7 @@
 
 /* extern symbols must be protected against C++ name mangling */
 #ifndef _BEGIN_EXTERNS_
-#if __cplusplus || c_plusplus
+#if defined(__cplusplus) || defined(c_plusplus)
 #define _BEGIN_EXTERNS_        extern "C" {
 #define _END_EXTERNS_  }
 #else
@@ -79,20 +79,20 @@
 
 /* dynamic linked library external scope handling */
 #undef extern
-#if _dll_import && !defined(__EXPORT__) && _DLL_BLD
+#if defined(_dll_import) && !defined(__EXPORT__) && defined(_DLL_BLD)
 #define __EXPORT__     __declspec(dllexport)
 #endif
-#if _dll_import && !defined(__IMPORT__)
+#if defined(_dll_import) && !defined(__IMPORT__)
 #define __IMPORT__     __declspec(dllimport)
 #endif
 #if !defined(_astimport)
-#if defined(__IMPORT__) && _DLL_BLD
+#if defined(__IMPORT__) && defined(_DLL_BLD)
 #define _astimport     __IMPORT__
 #else
 #define _astimport     extern
 #endif
 #endif /*_astimport*/
-#if !_DLL_BLD && _dll_import
+#if !defined(_DLL_BLD) && defined(_dll_import)
 #define __EXTERN__(T,obj)      extern T obj; T* _imp__ ## obj = &obj
 #define __DEFINE__(T,obj,val)  T obj = val; T* _imp__ ## obj = &obj
 #else
@@ -100,18 +100,18 @@
 #define __DEFINE__(T,obj,val)  T obj = val
 #endif
 #ifndef _AST_STD_H
-#      if _hdr_stddef
+#      if defined(_hdr_stddef)
 #      include <stddef.h>
 #      endif
-#      if _sys_types
+#      if defined(_sys_types)
 #      include <sys/types.h>
 #      endif
 #endif
-#if !_typ_size_t
+#if !defined(_typ_size_t)
 #      define _typ_size_t      1
 typedef int size_t;
 #endif
-#if !_typ_ssize_t
+#if !defined(_typ_ssize_t)
 #      define _typ_ssize_t     1
 typedef int ssize_t;
 #endif