8 files changed, 33 insertions, 10 deletions
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index 9c5d3df0388..2bdd701481b 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -6,7 +6,7 @@
  * Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *    $Id: fd.c,v 1.7 1996/11/04 04:53:24 momjian Exp $
+ *    $Id: fd.c,v 1.8 1996/11/06 06:48:51 scrappy Exp $
  *
  * NOTES:
  *
@@ -44,6 +44,8 @@
 #include <sys/stat.h>
 #include <string.h>
 #include <unistd.h>
+#include <sys/types.h>
+#include <fcntl.h>
 
 #include "c.h"
 #include "miscadmin.h"	/* for DataDir */
@@ -197,6 +199,7 @@ static int FileAccess(File file);
 static File fileNameOpenFile(FileName fileName, int fileFlags, int fileMode);
 static char *filepath(char *filename);
 
+int
 pg_fsync(fd)
 {
     extern int fsyncOff;
diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c
index b6a9df61c4d..b384f6a1810 100644
--- a/src/backend/storage/ipc/ipc.c
+++ b/src/backend/storage/ipc/ipc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.6 1996/11/03 05:06:54 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.7 1996/11/06 06:49:01 scrappy Exp $
  *
  * NOTES
  *
@@ -41,6 +41,11 @@
 #include "storage/ipc.h"
 #include "utils/memutils.h"
 
+#if defined(sparc_solaris)
+#include <string.h>
+#include <sys/ipc.h>
+#endif
+
 #if defined(bsd44)
 int UsePrivateMemory = 1;
 #else
diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c
index 6566657f417..70c73f14c56 100644
--- a/src/backend/storage/ipc/ipci.c
+++ b/src/backend/storage/ipc/ipci.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.2 1996/11/03 05:06:55 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.3 1996/11/06 06:49:03 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,6 +22,11 @@
 #include "storage/lock.h"
 #include "miscadmin.h"		/* for DebugLvl */
 
+#if defined(sparc_solaris)
+#include <string.h>
+#include <sys/ipc.h>
+#endif
+
 /*
  * SystemPortAddressCreateMemoryKey --
  *	Returns a memory key given a port address.
diff --git a/src/backend/storage/ipc/s_lock.c b/src/backend/storage/ipc/s_lock.c
index 1460fa3584c..3c8f8c14eb2 100644
--- a/src/backend/storage/ipc/s_lock.c
+++ b/src/backend/storage/ipc/s_lock.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/s_lock.c,v 1.6 1996/11/03 05:06:56 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/s_lock.c,v 1.7 1996/11/06 06:49:04 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -316,7 +316,7 @@ tas_dummy()
  * SPARC (SunOS 4)
  */
 
-#if defined(sparc)
+#if defined(sparc) && !defined(sparc_solaris)
 
 /* if we're using -ansi w/ gcc, use __asm__ instead of asm */
 #if defined(__STRICT_ANSI__)
diff --git a/src/backend/storage/ipc/sinval.c b/src/backend/storage/ipc/sinval.c
index c7f88559d24..8ea1643049e 100644
--- a/src/backend/storage/ipc/sinval.c
+++ b/src/backend/storage/ipc/sinval.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinval.c,v 1.3 1996/11/03 05:06:59 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinval.c,v 1.4 1996/11/06 06:49:09 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,6 +18,7 @@
 
 #include "postgres.h"
 
+#include "storage/backendid.h"
 #include "storage/sinval.h"
 #include "storage/sinvaladt.h"
 #include "storage/spin.h"
diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c
index 0869a46a830..3c801729a20 100644
--- a/src/backend/storage/ipc/sinvaladt.c
+++ b/src/backend/storage/ipc/sinvaladt.c
@@ -7,14 +7,16 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.2 1996/11/03 05:07:00 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.3 1996/11/06 06:49:10 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
+#include <stdio.h>
 
 #include "postgres.h"
 
 #include "storage/ipc.h"
+#include "storage/backendid.h"
 #include "storage/sinvaladt.h"
 #include "storage/lmgr.h"
 #include "utils/palloc.h"
diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c
index 719b0e5cb12..01c531ed4e5 100644
--- a/src/backend/storage/large_object/inv_api.c
+++ b/src/backend/storage/large_object/inv_api.c
@@ -8,13 +8,14 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.3 1996/11/03 05:07:10 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.4 1996/11/06 06:49:17 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <stdio.h>		/* for sprintf() */
 #include <sys/file.h>
 #include "postgres.h"
+#include "miscadmin.h"
 #include "libpq/libpq-fs.h"
 #include "access/genam.h"
 #include "access/heapam.h"
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index 8ee7b6f78ba..59007edb9f5 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.7 1996/11/03 05:07:32 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.8 1996/11/06 06:49:24 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,7 +46,7 @@
  *      This is so that we can support more backends. (system-wide semaphore
  *      sets run out pretty fast.)                -ay 4/95
  *
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.7 1996/11/03 05:07:32 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.8 1996/11/06 06:49:24 scrappy Exp $
  */
 #include <sys/time.h>
 #ifndef WIN32
@@ -55,7 +55,13 @@
 #include <string.h>
 #include <sys/types.h>
 
+#if defined(sparc_solaris)
+#include <sys/ipc.h>
+#include <sys/sem.h>
+#endif
+
 #include "postgres.h"
+#include "miscadmin.h"
 #include "libpq/pqsignal.h"	/* substitute for <signal.h> */
 
 #include "access/xact.h"