Fix for various aix related 'mis-defines'

From: Darren King <darrenk@insightdist.com>

diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
index a9c4417..d923c88 100644 (file)
--- a/src/include/storage/s_lock.h
+++ b/src/include/storage/s_lock.h
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.21 1998/01/26 01:01:37 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.22 1998/02/03 02:08:58 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -141,7 +141,7 @@ static int  tas(slock_t *lock);
  * (see storage/ipc.h).
  */
 
-#if defined(aix)
+#if defined(__AIX)
 
 #define        S_LOCK(lock)    do \
                                                { \
@@ -153,7 +153,7 @@ static int  tas(slock_t *lock);
 
 #define        S_INIT_LOCK(lock)       S_UNLOCK(lock)
 
-#endif                                                 /* aix */
+#endif                                                 /* __AIX */
 
 /*
  * HP-UX (PA-RISC)

diff --git a/src/include/utils/dt.h b/src/include/utils/dt.h
index d2afbe5..8e26f0b 100644 (file)
--- a/src/include/utils/dt.h
+++ b/src/include/utils/dt.h
@@ -8,7 +8,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dt.h,v 1.25 1998/01/24 22:50:39 momjian Exp $
+ * $Id: dt.h,v 1.26 1998/02/03 02:09:02 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -187,11 +187,11 @@ typedef struct
 /* keep this struct small; it gets used a lot */
 typedef struct
 {
-#if defined(aix)
+#if defined(__AIX)
        char       *token;
 #else
        char            token[TOKMAXLEN];
-#endif                                                 /* aix */
+#endif                                                 /* __AIX */
        char            type;
        char            value;                  /* this may be unsigned, alas */
 } datetkn;

diff --git a/src/include/utils/nabstime.h b/src/include/utils/nabstime.h
index 8fcaee7..441a095 100644 (file)
--- a/src/include/utils/nabstime.h
+++ b/src/include/utils/nabstime.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nabstime.h,v 1.13 1997/09/08 21:55:13 momjian Exp $
+ * $Id: nabstime.h,v 1.14 1998/02/03 02:09:08 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -53,7 +53,7 @@ typedef TimeIntervalData *TimeInterval;
 #define BIG_ABSTIME            ((AbsoluteTime) 0x7FFFFFFB)             /* 2147483644 == 2^31 -
                                                                                                                 * 4 */
 
-#if defined(aix)
+#if defined(__AIX)
 /*
  * AIX considers 2147483648 == -2147483648 (since they have the same bit
  * representation) but uses a different sign sense in a comparison to
@@ -63,7 +63,7 @@ typedef TimeIntervalData *TimeInterval;
 #define NOSTART_ABSTIME                 ((AbsoluteTime) INT_MIN)
 #else
 #define NOSTART_ABSTIME ((AbsoluteTime) 0x80000001)            /* -2147483647 == - 2^31 */
-#endif                                                 /* aix */
+#endif                                                 /* __AIX */
 
 #define INVALID_RELTIME ((RelativeTime) 0x7FFFFFFE)            /* 2147483647 == 2^31 -
                                                                                                                 * 1 */