9 files changed, 31 insertions, 12 deletions
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index 874023c187..9704b94965 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.15 1996/11/13 20:48:55 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.16 1996/11/26 03:17:45 bryanh Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,6 +37,8 @@
 #include "optimizer/clauses.h"
 #include "access/heapam.h"
 
+#include "port-protos.h"        /* strdup() */
+
 /* convert the parse tree into a query tree */
 static Query *transformStmt(ParseState *pstate, Node *stmt);
 
diff --git a/src/backend/parser/catalog_utils.c b/src/backend/parser/catalog_utils.c
index 20206e0134..91a744beb7 100644
--- a/src/backend/parser/catalog_utils.c
+++ b/src/backend/parser/catalog_utils.c
@@ -6,7 +6,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/parser/Attic/catalog_utils.c,v 1.10 1996/11/13 20:48:58 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/parser/Attic/catalog_utils.c,v 1.11 1996/11/26 03:17:47 bryanh Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -48,6 +48,8 @@
 #include "utils/lsyscache.h"
 #include "storage/lmgr.h"
 
+#include "port-protos.h"              /* strdup() */
+
 struct {
     char *field;
     int code;
diff --git a/src/backend/port/Makefile b/src/backend/port/Makefile
index 54c4482c43..8969d82c1c 100644
--- a/src/backend/port/Makefile
+++ b/src/backend/port/Makefile
@@ -19,7 +19,7 @@
 # be converted to Method 2.  
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/port/Makefile,v 1.4 1996/11/10 03:13:27 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/backend/port/Makefile,v 1.5 1996/11/26 03:18:38 bryanh Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -36,6 +36,11 @@ ifeq ($(PORTNAME), sparc_solaris)
 OBJS += inet_aton.o
 endif
 
+ifeq ($(PORTNAME), ultrix4)
+# Other ports get the inet_aton() function from their standard C libraries.
+OBJS += inet_aton.o
+endif
+
 all: submake SUBSYS.o
 
 SUBSYS.o: $(OBJS)
diff --git a/src/backend/port/inet_aton.c b/src/backend/port/inet_aton.c
index 1b08e7eaa7..37c11b621b 100644
--- a/src/backend/port/inet_aton.c
+++ b/src/backend/port/inet_aton.c
@@ -42,6 +42,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.  */
 
+#include <sys/types.h>
 #include <netinet/in.h>
 #include <ctype.h>
 #include "inet_aton.h"
diff --git a/src/backend/port/ultrix4/dl.h b/src/backend/port/ultrix4/dl.h
index 883a683324..7855db38f3 100644
--- a/src/backend/port/ultrix4/dl.h
+++ b/src/backend/port/ultrix4/dl.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dl.h,v 1.2 1996/11/14 20:08:57 scrappy Exp $
+ * $Id: dl.h,v 1.3 1996/11/26 03:18:46 bryanh Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,6 +34,7 @@
 #ifndef _DL_HEADER_
 #define _DL_HEADER_
 
+#include <stdio.h> /* needed to declare FILE for ldfcn.h */
 #include <filehdr.h>
 #include <syms.h>
 #include <ldfcn.h>
diff --git a/src/backend/port/ultrix4/dynloader.c b/src/backend/port/ultrix4/dynloader.c
index dc526885ca..1acc54260a 100644
--- a/src/backend/port/ultrix4/dynloader.c
+++ b/src/backend/port/ultrix4/dynloader.c
@@ -9,13 +9,14 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/port/ultrix4/Attic/dynloader.c,v 1.2 1996/11/14 20:08:58 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/port/ultrix4/Attic/dynloader.c,v 1.3 1996/11/26 03:18:50 bryanh Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <stdio.h>
 #include <postgres.h>
 #include "dl.h"
+#include <utils/dynamic_loader.h>
 #include "c.h"
 #include "fmgr.h"
 #include "port-protos.h"
diff --git a/src/backend/port/ultrix4/port-protos.h b/src/backend/port/ultrix4/port-protos.h
index ed055dd19c..ea313040d9 100644
--- a/src/backend/port/ultrix4/port-protos.h
+++ b/src/backend/port/ultrix4/port-protos.h
@@ -6,16 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: port-protos.h,v 1.1.1.1 1996/07/09 06:21:45 scrappy Exp $
+ * $Id: port-protos.h,v 1.2 1996/11/26 03:18:58 bryanh Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PORT_PORTOS_H
 #define PORT_PORTOS_H
 
-#include "utils/dynamic_loader.h"
-#include "dl.h"
-
 /* dynloader.c */
 /*
  * New dynamic loader.
@@ -33,4 +30,7 @@
 
 extern void init_address_fixup(void);
 
+/* strdup.c: strdup() is not part of libc on Ultrix */
+extern char* strdup(char const*);
+
 #endif 	/* PORT_PORTOS_H */
diff --git a/src/backend/port/ultrix4/strdup.c b/src/backend/port/ultrix4/strdup.c
index f140711226..882f0047e6 100644
--- a/src/backend/port/ultrix4/strdup.c
+++ b/src/backend/port/ultrix4/strdup.c
@@ -7,14 +7,18 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/port/ultrix4/Attic/strdup.c,v 1.1.1.1 1996/07/09 06:21:45 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/port/ultrix4/Attic/strdup.c,v 1.2 1996/11/26 03:19:04 bryanh Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <string.h>
 
+#include <utils/palloc.h>
+
+#include "port-protos.h"
+
 char *
-strdup(char *string)
+strdup(char const *string)
 {
     char *nstr;
 
diff --git a/src/backend/utils/mmgr/palloc.c b/src/backend/utils/mmgr/palloc.c
index c3b9ec77cc..8830a21f40 100644
--- a/src/backend/utils/mmgr/palloc.c
+++ b/src/backend/utils/mmgr/palloc.c
@@ -7,10 +7,13 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/palloc.c,v 1.2 1996/11/24 04:44:17 bryanh Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/palloc.c,v 1.3 1996/11/26 03:19:12 bryanh Exp $
  *
  *-------------------------------------------------------------------------
  */
+
+#include <string.h>
+
 #include "c.h"
 
 #include "utils/mcxt.h"