Make compile on AIX, Alpha OSF. Thanks Darren King, Igor Notanzon.

src/backend/access/nbtree/nbtsearch.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.11 1996/12/06 09:41:45 vadim Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.12 1996/12/15 09:05:10 bryanh Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,11 +27,19 @@
 #endif
 
 
-static BTStack _bt_searchr(Relation rel, int keysz, ScanKey scankey, Buffer *bufP, BTStack stack_in);
-static OffsetNumber _bt_firsteq(Relation rel, TupleDesc itupdesc, Page page, Size keysz, ScanKey scankey, OffsetNumber offnum);
-int _bt_compare(Relation rel, TupleDesc itupdesc, Page page, int keysz, ScanKey scankey, OffsetNumber offnum);
-static bool _bt_twostep(IndexScanDesc scan, Buffer *bufP, ScanDirection dir);
-static RetrieveIndexResult _bt_endpoint(IndexScanDesc scan, ScanDirection dir);
+static BTStack 
+_bt_searchr(Relation rel, int keysz, ScanKey scankey, 
+            Buffer *bufP, BTStack stack_in);
+static OffsetNumber 
+_bt_firsteq(Relation rel, TupleDesc itupdesc, Page page, 
+            Size keysz, ScanKey scankey, OffsetNumber offnum);
+int 
+_bt_compare(Relation rel, TupleDesc itupdesc, Page page, 
+            int keysz, ScanKey scankey, OffsetNumber offnum);
+static bool 
+_bt_twostep(IndexScanDesc scan, Buffer *bufP, ScanDirection dir);
+static RetrieveIndexResult 
+_bt_endpoint(IndexScanDesc scan, ScanDirection dir);
 
 /*
  *  _bt_search() -- Search for a scan key in the index.
@@ -472,7 +480,7 @@ _bt_compare(Relation rel,
 	    elog(WARN, "_bt_compare: invalid comparison to high key");
 	}
 
-#ifdef 0
+#if 0
 	/*
 	 *  We just have to belive that right answer will not
 	 *  break anything. I've checked code and all seems to be ok.
@@ -1130,7 +1138,7 @@ _bt_endpoint(IndexScanDesc scan, ScanDirection dir)
 	 * Scanning in BackwardScanDirection is not understandable at all.
 	 * Well - new stuff. - vadim 12/06/96
 	 */
-#ifdef 0
+#if 0
 	if (PageIsEmpty(page) || start > maxoff) {
 	    ItemPointerSet(current, blkno, maxoff);
 	    if (!_bt_step(scan, &buf, BackwardScanDirection))
@@ -1166,7 +1174,7 @@ _bt_endpoint(IndexScanDesc scan, ScanDirection dir)
 	 * empty why do scanning in ForwardScanDirection ???
 	 * Well - new stuff. - vadim 12/06/96
 	 */
-#ifdef 0
+#if 0
 	if (PageIsEmpty(page)) {
 	    ItemPointerSet(current, blkno, FirstOffsetNumber);
 	    if (!_bt_step(scan, &buf, ForwardScanDirection))

src/backend/port/aix/mkldexport.sh

@@ -17,7 +17,7 @@
 #
 
 # setting this to nm -B might be better
-NM = /usr/ucb/nm
+NM=/usr/ucb/nm
 
 CMDNAME=`basename $0`
 if [ -z "$1" ]; then

src/backend/utils/adt/nabstime.c

@@ -7,13 +7,14 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.7 1996/11/08 05:59:45 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.8 1996/12/15 09:05:35 bryanh Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
+#include <sys/timeb.h>
 #include <sys/types.h>
 #include "postgres.h"
 #include "access/xact.h"

src/include/config.h

@@ -15,6 +15,12 @@
 #endif
 #endif /* !defined(sparc_solaris) */
 
+#if defined(aix)
+#define TERMIOS_H_LOCATION <termios.h>
+#else
+#define TERMIOS_H_LOCATION <sys/termios.h>
+#endif
+
 #define HAVE_MEMMOVE
 
 #if defined(aix)
@@ -39,6 +45,7 @@
 #  define NEED_UNION_SEMUN 
 #  define SB_PAD 40
 #  define HAS_TEST_AND_SET
+   include <sys/mman.h>  /* for msemaphore */
    typedef msemaphore slock_t;
 #endif
 

src/include/regex/regex.h

@@ -48,7 +48,7 @@ typedef off_t regoff_t;
 typedef struct {
         int re_magic;
         size_t re_nsub;         /* number of parenthesized subexpressions */
-	__const char *re_endp;	/* end pointer for REG_PEND */
+        const char *re_endp;    /* end pointer for REG_PEND */
         struct re_guts *re_g;   /* none of your business :-) */
 } regex_t;
 
@@ -95,12 +95,10 @@ typedef struct {
 #define REG_LARGE       01000   /* force large representation */
 #define REG_BACKR       02000   /* force use of backref code */
 
-__BEGIN_DECLS
-int	pg95_regcomp __P((regex_t *, const char *, int));
-size_t	pg95_regerror __P((int, const regex_t *, char *, size_t));
-int	pg95_regexec __P((const regex_t *,
-	    const char *, size_t, regmatch_t [], int));
-void	pg95_regfree __P((regex_t *));
-__END_DECLS
+int     pg95_regcomp(regex_t *, const char *, int);
+size_t  pg95_regerror(int, const regex_t *, char *, size_t);
+int     pg95_regexec (const regex_t *,
+                      const char *, size_t, regmatch_t [], int);
+void    pg95_regfree (regex_t *);
 
 #endif /* !_REGEX_H_ */

src/interfaces/libpq/fe-exec.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.20 1996/12/13 09:25:08 bryanh Exp $
+ *    $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.21 1996/12/15 09:05:53 bryanh Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,7 +21,7 @@
 #include "libpq-fe.h"
 #include <signal.h>
 #include <sys/ioctl.h>
-#include <sys/termios.h>
+#include TERMIOS_H_LOCATION
 
 #ifdef TIOCGWINSZ
 struct winsize screen_size;