Remove DISABLE_COMPLEX_MACRO definitions, since people seem to be getting

by without them.

Don't check for preprocessor symbols from system header files in port
include files, since those header files aren't included at this point.

diff --git a/src/include/port/sco.h b/src/include/port/sco.h
index 1e08b5b8a5c569f9e135caa5b6905d8d3280e47b..438e5b2001fc60136078bbae57b5108b656b6137 100644 (file)
--- a/src/include/port/sco.h
+++ b/src/include/port/sco.h
@@ -1,9 +1,3 @@
-#ifndef NOFILE
-#define NOFILE                 NOFILES_MIN
-#endif
-
-#define DISABLE_COMPLEX_MACRO
-
 /* see src/backend/libpq/pqcomm.c */
 #define SCO_ACCEPT_BUG
 

diff --git a/src/include/port/univel.h b/src/include/port/univel.h
index 09bd50c5d8a04c620d38a2c30f7176d5e92a59ae..071ac1f1ad279eb19398c2f0ef091561cf75b625 100644 (file)
--- a/src/include/port/univel.h
+++ b/src/include/port/univel.h
@@ -9,8 +9,6 @@
 
 typedef unsigned char slock_t;
 
-#define DISABLE_COMPLEX_MACRO
-
 #ifndef                        BIG_ENDIAN
 #define                        BIG_ENDIAN              4321
 #endif

diff --git a/src/include/port/unixware.h b/src/include/port/unixware.h
index 7a622c83a994d1524b28b477c28db96763ccd5a5..789f1e1b72d58f917615b5d492c474273312de25 100644 (file)
--- a/src/include/port/unixware.h
+++ b/src/include/port/unixware.h
@@ -12,8 +12,6 @@
 
 typedef unsigned char slock_t;
 
-#define DISABLE_COMPLEX_MACRO
-
 #ifndef                        BIG_ENDIAN
 #define                        BIG_ENDIAN              4321
 #endif