More stuff to make it compile on various ports.

src/include/config.h

@@ -17,8 +17,14 @@
 
 #define HAVE_MEMMOVE
 
-#if defined(sequent) 
+#if defined(aix)
+#  define CLASS_CONFLICT 
+#  define DISABLE_XOPEN_NLS 
+#  define NEED_ISINF
 #  define NEED_UNION_SEMUN 
+#  define NEED_SYS_SELECT_H
+#  define HAVE_TZSET
+#  define HAVE_ANSI_CPP
 #endif
 
 #if defined(alpha)
@@ -30,6 +36,19 @@
 #  define NEED_UNION_SEMUN 
 #endif
 
+#if defined(BSD44_derived) || \
+    defined(bsdi)
+#  if defined(bsdi)
+#    define SIGJMP_BUF
+#  endif
+#  define USE_LIMITS_H
+#  define USE_POSIX_TIME
+#  define NEED_CBRT
+#  if defined(PRE_BSDI_2_1)
+#    define NEED_UNION_SEMUN 
+#  endif
+#endif
+
 #if defined(dgux)
 #  define LINUX_ELF
 #  define NEED_UNION_SEMUN 
@@ -37,26 +56,8 @@
 #  define -DUSE_POSIX_SIGNALS
 #endif
 
-#if defined(ultrix4)
-#  define NEED_ISINF 
-#  define USE_POSIX_TIME
-#  define NEED_UNION_SEMUN 
-#  define NEED_STRDUP
-#endif
-
-#if defined(linux)
-/* __USE_POSIX, __USE_BSD, and __USE_BSD_SIGNAL used to be defined either
-   here or with -D compile options, but __ macros should be set and used by C
-   library macros, not Postgres code.  __USE_POSIX is set by features.h,
-   __USE_BSD is set by bsd/signal.h, and __USE_BSD_SIGNAL appears not to
-   be used.
-*/
-#  define USE_POSIX_TIME
-#  define HAVE_TZSET
-#  define NEED_CBRT
-#endif
-
 #if defined(hpux)
+#  define SIGJMP_BUF
 #  define USE_POSIX_TIME
 #  define HAVE_TZSET
 #  define NEED_CBRT
@@ -75,6 +76,38 @@
 #  define SYSV_DIRENT
 #endif
 
+#if defined(irix5)
+#  define USE_POSIX_TIME 
+#  define USE_POSIX_SIGNALS
+#  define NEED_ISINF 
+#  define NO_EMPTY_STMTS
+#  define NO_VFORK
+#  define HAVE_TZSET
+#  define SYSV_DIRENT
+#endif
+
+#if defined(linux)
+/* __USE_POSIX, __USE_BSD, and __USE_BSD_SIGNAL used to be defined either
+   here or with -D compile options, but __ macros should be set and used by C
+   library macros, not Postgres code.  __USE_POSIX is set by features.h,
+   __USE_BSD is set by bsd/signal.h, and __USE_BSD_SIGNAL appears not to
+   be used.
+*/
+#  define SIGJMP_BUF
+#  define USE_POSIX_TIME
+#  define HAVE_TZSET
+#  define NEED_CBRT
+#endif
+
+#if defined(next)
+#  define SIGJMP_BUF
+#  define NEED_SIG_JMP
+#endif
+
+#if defined(sequent) 
+#  define NEED_UNION_SEMUN 
+#endif
+
 #if defined(sparc) && !defined(sparc_solaris)
 #  define USE_POSIX_TIME
 #  undef HAVE_MEMMOVE
@@ -103,11 +136,8 @@
 #  define SYSV_DIRENT
 #endif
 
-#if defined(next)
-#  define NEED_SIG_JMP
-#endif
-
 #if defined(win32)
+#  define SIGJMP_BUF
 #  define NEED_SIG_JMP
 #  define NO_UNISTD_H
 #  define USES_WINSOCK 
@@ -118,36 +148,14 @@
 #  define NEED_ISINF
 #endif /* WIN32 */
 
-#if defined(BSD44_derived) || \
-    defined(bsdi)
-#  define USE_LIMITS_H
-#  define USE_POSIX_TIME
-#  define NEED_CBRT
-#  ifdef PRE_BSDI_2_1
-#    define NEED_UNION_SEMUN 
-#  endif
-#endif
-
-#if defined(aix)
-#  define CLASS_CONFLICT 
-#  define DISABLE_XOPEN_NLS 
-#  define NEED_ISINF
-#  define NEED_UNION_SEMUN 
-#  define NEED_SYS_SELECT_H
-#  define HAVE_TZSET
-#  define HAVE_ANSI_CPP
-#endif
-
-#if defined(irix5)
-#  define USE_POSIX_TIME 
-#  define USE_POSIX_SIGNALS
+#if defined(ultrix4)
 #  define NEED_ISINF 
-#  define NO_EMPTY_STMTS
-#  define NO_VFORK
-#  define HAVE_TZSET
-#  define SYSV_DIRENT
+#  define USE_POSIX_TIME
+#  define NEED_UNION_SEMUN 
+#  define NEED_STRDUP
 #endif
 
+
 /*
  * The following is used as the arg list for signal handlers.  Any ports
  * that take something other than an int argument should change this in

src/include/storage/ipc.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: ipc.h,v 1.9 1996/11/04 04:00:28 momjian Exp $
+ * $Id: ipc.h,v 1.10 1996/11/27 08:16:38 bryanh Exp $
  *
  * NOTES
  *    This file is very architecture-specific.  This stuff should actually
@@ -22,6 +22,7 @@
 #endif
 
 #include <sys/types.h>
+#include <sys/ipc.h>   /* For IPC_PRIVATE */
 
 /*
  * Many architectures have support for user-level spinlocks (i.e., an

src/include/strdup.h

@@ -0,0 +1,8 @@
+/* This is the prototype for the strdup() function which is distributed
+   with Postgres.  That strdup() is only needed on those systems that
+   don't already have strdup() in their system libraries.
+
+   The Postgres strdup() is in src/utils/strdup.c.
+*/
+
+extern char* strdup(char const*);

src/include/utils/exc.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: exc.h,v 1.4 1996/11/10 03:06:26 momjian Exp $
+ * $Id: exc.h,v 1.5 1996/11/27 08:16:44 bryanh Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,17 +15,15 @@
 
 #include <setjmp.h>
 
+#include "config.h"
+
 extern char *ExcFileName;
 extern Index ExcLineNumber;
 
 /*
  * ExcMessage and Exception are now defined in c.h
  */
-
-#if defined(hpux) || \
-    defined(linux) || \
-    defined(next) || \
-    defined(WIN32)
+#if !defined(SIGJMP_BUF)
 typedef jmp_buf		ExcContext;
 #else
 typedef sigjmp_buf	ExcContext;