From 8ed5918faa21f26fe7c0c36487960e815ef6b108 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 19 Jun 1998 02:55:19 +0000
Subject: [PATCH] Solaris cleanup.

---
 .../port/dynloader/{i386_solaris.c => solaris_i386.c}       | 2 +-
 .../port/dynloader/{i386_solaris.h => solaris_i386.h}       | 2 +-
 .../port/dynloader/{sparc_solaris.c => solaris_sparc.c}     | 2 +-
 .../port/dynloader/{sparc_solaris.h => solaris_sparc.h}     | 2 +-
 src/backend/port/getrusage.c                                | 6 +++---
 src/backend/port/tas/solaris_i386.s                         | 2 +-
 src/backend/storage/ipc/ipc.c                               | 4 ++--
 src/backend/storage/lmgr/proc.c                             | 6 +++---
 src/bin/pg_dump/common.c                                    | 4 ++--
 src/bin/pg_dump/pg_dump.c                                   | 4 ++--
 src/include/port/{i386_solaris.h => solaris_i386.h}         | 0
 src/include/port/{sparc_solaris.h => solaris_sparc.h}       | 0
 12 files changed, 17 insertions(+), 17 deletions(-)
 rename src/backend/port/dynloader/{i386_solaris.c => solaris_i386.c} (70%)
 mode change 100644 => 100755
 rename src/backend/port/dynloader/{i386_solaris.h => solaris_i386.h} (93%)
 mode change 100644 => 100755
 rename src/backend/port/dynloader/{sparc_solaris.c => solaris_sparc.c} (70%)
 mode change 100644 => 100755
 rename src/backend/port/dynloader/{sparc_solaris.h => solaris_sparc.h} (93%)
 mode change 100644 => 100755
 rename src/include/port/{i386_solaris.h => solaris_i386.h} (100%)
 mode change 100644 => 100755
 rename src/include/port/{sparc_solaris.h => solaris_sparc.h} (100%)
 mode change 100644 => 100755

diff --git a/src/backend/port/dynloader/i386_solaris.c b/src/backend/port/dynloader/solaris_i386.c
old mode 100644
new mode 100755
similarity index 70%
rename from src/backend/port/dynloader/i386_solaris.c
rename to src/backend/port/dynloader/solaris_i386.c
index 0d566f3a61..4adf3093c1
--- a/src/backend/port/dynloader/i386_solaris.c
+++ b/src/backend/port/dynloader/solaris_i386.c
@@ -1,4 +1,4 @@
 /* Dummy file used for nothing at this point
  *
- * see i386_solaris.h
+ * see solaris_i386.h
  */
diff --git a/src/backend/port/dynloader/i386_solaris.h b/src/backend/port/dynloader/solaris_i386.h
old mode 100644
new mode 100755
similarity index 93%
rename from src/backend/port/dynloader/i386_solaris.h
rename to src/backend/port/dynloader/solaris_i386.h
index adbd4a4c3b..631fa0648e
--- a/src/backend/port/dynloader/i386_solaris.h
+++ b/src/backend/port/dynloader/solaris_i386.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: i386_solaris.h,v 1.1 1997/12/20 03:23:33 scrappy Exp $
+ * $Id: solaris_i386.h,v 1.1 1998/06/19 02:55:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/port/dynloader/sparc_solaris.c b/src/backend/port/dynloader/solaris_sparc.c
old mode 100644
new mode 100755
similarity index 70%
rename from src/backend/port/dynloader/sparc_solaris.c
rename to src/backend/port/dynloader/solaris_sparc.c
index 0d566f3a61..4adf3093c1
--- a/src/backend/port/dynloader/sparc_solaris.c
+++ b/src/backend/port/dynloader/solaris_sparc.c
@@ -1,4 +1,4 @@
 /* Dummy file used for nothing at this point
  *
- * see i386_solaris.h
+ * see solaris_i386.h
  */
diff --git a/src/backend/port/dynloader/sparc_solaris.h b/src/backend/port/dynloader/solaris_sparc.h
old mode 100644
new mode 100755
similarity index 93%
rename from src/backend/port/dynloader/sparc_solaris.h
rename to src/backend/port/dynloader/solaris_sparc.h
index 3645c939ae..22c7d67c77
--- a/src/backend/port/dynloader/sparc_solaris.h
+++ b/src/backend/port/dynloader/solaris_sparc.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: sparc_solaris.h,v 1.1 1997/12/20 03:35:55 scrappy Exp $
+ * $Id: solaris_sparc.h,v 1.1 1998/06/19 02:55:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/port/getrusage.c b/src/backend/port/getrusage.c
index fb2a1fe7a3..f1fa5d0bd7 100644
--- a/src/backend/port/getrusage.c
+++ b/src/backend/port/getrusage.c
@@ -1,4 +1,4 @@
-/* $Id: getrusage.c,v 1.7 1998/02/26 04:34:00 momjian Exp $ */
+/* $Id: getrusage.c,v 1.8 1998/06/19 02:55:04 momjian Exp $ */
 
 #include <math.h>				/* for pow() prototype */
 
@@ -7,9 +7,9 @@
 
 #if 0							/* this is from univel port ... how does
 								 * compiler define? */
- /* same for i386_solaris port ... how does compiler define? */
+ /* same for solaris_i386 port ... how does compiler define? */
  /* same for sco port ... how does compiler define? */
- /* same for sparc_solaris port ... how does compiler define? */
+ /* same for solaris_sparc port ... how does compiler define? */
  /* same for svr4 port ... how does compiler define? */
 int
 getrusage(int who, struct rusage * rusage)
diff --git a/src/backend/port/tas/solaris_i386.s b/src/backend/port/tas/solaris_i386.s
index db8116dd8f..c63aebef32 100644
--- a/src/backend/port/tas/solaris_i386.s
+++ b/src/backend/port/tas/solaris_i386.s
@@ -1,5 +1,5 @@
 /=============================================================================
-/ tas.s -- test and set lock for i386_solaris
+/ tas.s -- test and set lock for solaris_i386
 /=============================================================================
 
         .file   "tas.s"
diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c
index d3e907b2c7..d9d5a503d0 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.24 1998/06/18 03:56:08 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.25 1998/06/19 02:55:10 momjian Exp $
  *
  * NOTES
  *
@@ -40,7 +40,7 @@
 #include "utils/memutils.h"
 #include "libpq/libpq.h"
 
-#if defined(sparc_solaris)
+#if defined(solaris_sparc)
 #include <string.h>
 #include <sys/ipc.h>
 #endif
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index 31d4372380..d6ef6f9e7a 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.35 1998/06/15 19:29:21 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.36 1998/06/19 02:55:11 momjian 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.35 1998/06/15 19:29:21 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.36 1998/06/19 02:55:11 momjian Exp $
  */
 #include <sys/time.h>
 #include <unistd.h>
@@ -54,7 +54,7 @@
 #include <signal.h>
 #include <sys/types.h>
 
-#if defined(sparc_solaris)
+#if defined(solaris_sparc)
 #include <sys/ipc.h>
 #include <sys/sem.h>
 #endif
diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c
index bc58b8e45c..d84ac0aa5e 100644
--- a/src/bin/pg_dump/common.c
+++ b/src/bin/pg_dump/common.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.21 1998/06/15 19:30:00 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.22 1998/06/19 02:55:13 momjian Exp $
  *
  * Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2
  *
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <sys/param.h>			/* for MAXHOSTNAMELEN on most */
-#ifdef sparc_solaris
+#ifdef solaris_sparc
 #include <netdb.h>				/* for MAXHOSTNAMELEN on some */
 #endif
 
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index d80a2676dc..7243896312 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -21,7 +21,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.74 1998/06/16 07:29:32 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.75 1998/06/19 02:55:14 momjian Exp $
  *
  * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
  *
@@ -57,7 +57,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <sys/param.h>			/* for MAXHOSTNAMELEN on most */
-#ifdef sparc_solaris
+#ifdef solaris_sparc
 #include <netdb.h>				/* for MAXHOSTNAMELEN on some */
 #endif
 
diff --git a/src/include/port/i386_solaris.h b/src/include/port/solaris_i386.h
old mode 100644
new mode 100755
similarity index 100%
rename from src/include/port/i386_solaris.h
rename to src/include/port/solaris_i386.h
diff --git a/src/include/port/sparc_solaris.h b/src/include/port/solaris_sparc.h
old mode 100644
new mode 100755
similarity index 100%
rename from src/include/port/sparc_solaris.h
rename to src/include/port/solaris_sparc.h