Unify solaris_i386 and solaris_sparc templates. They were almost identical

anyway, the rest being due to them not being kept in sync.  Add configure
test for lorder and use it (on Solaris) when found.

5 files changed, 17 insertions, 79 deletions

diff --git a/src/backend/port/dynloader/solaris_i386.c b/src/backend/port/dynloader/solaris.c
index 4adf3093c1c..2e92cd372c5 100755..100644
--- a/src/backend/port/dynloader/solaris_i386.c
+++ b/src/backend/port/dynloader/solaris.c
@@ -1,4 +1,4 @@
 /* Dummy file used for nothing at this point
  *
- * see solaris_i386.h
+ * see solaris.h
  */
diff --git a/src/backend/port/dynloader/solaris.h b/src/backend/port/dynloader/solaris.h
new file mode 100644
index 00000000000..7232418b13e
--- /dev/null
+++ b/src/backend/port/dynloader/solaris.h
@@ -0,0 +1,16 @@
+/* $Header: /cvsroot/pgsql/src/backend/port/dynloader/solaris.h,v 1.1 2000/10/10 21:22:23 petere Exp $ */
+
+#ifndef DYNLOADER_SOLARIS_H
+#define DYNLOADER_SOLARIS_H
+
+#include "config.h"
+#include <dlfcn.h>
+#include "fmgr.h"
+#include "utils/dynamic_loader.h"
+
+#define pg_dlopen(f)	dlopen(f,1)
+#define pg_dlsym		dlsym
+#define pg_dlclose		dlclose
+#define pg_dlerror		dlerror
+
+#endif /* DYNLOADER_SOLARIS_H */
diff --git a/src/backend/port/dynloader/solaris_i386.h b/src/backend/port/dynloader/solaris_i386.h
deleted file mode 100755
index ed1cebaf2ce..00000000000
--- a/src/backend/port/dynloader/solaris_i386.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * port_protos.h
- *	  port-specific prototypes for SunOS 4
- *
- *
- * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- * $Id: solaris_i386.h,v 1.5 2000/01/26 05:56:44 momjian Exp $
- *
- *-------------------------------------------------------------------------
- */
-#ifndef PORT_PROTOS_H
-#define PORT_PROTOS_H
-
-#include <dlfcn.h>
-#include "fmgr.h"
-#include "utils/dynamic_loader.h"
-
-/* dynloader.c */
-/*
- * Dynamic Loader on SunOS 4.
- *
- * this dynamic loader uses the system dynamic loading interface for shared
- * libraries (ie. dlopen/dlsym/dlclose). The user must specify a shared
- * library as the file to be dynamically loaded.
- *
- */
-#define pg_dlopen(f)	dlopen(f,1)
-#define pg_dlsym		dlsym
-#define pg_dlclose		dlclose
-#define pg_dlerror		dlerror
-
-#endif	 /* PORT_PROTOS_H */
diff --git a/src/backend/port/dynloader/solaris_sparc.c b/src/backend/port/dynloader/solaris_sparc.c
deleted file mode 100755
index 4adf3093c1c..00000000000
--- a/src/backend/port/dynloader/solaris_sparc.c
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Dummy file used for nothing at this point
- *
- * see solaris_i386.h
- */
diff --git a/src/backend/port/dynloader/solaris_sparc.h b/src/backend/port/dynloader/solaris_sparc.h
deleted file mode 100755
index 61b6b998b66..00000000000
--- a/src/backend/port/dynloader/solaris_sparc.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * port_protos.h
- *	  port-specific prototypes for SunOS 4
- *
- *
- * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- * $Id: solaris_sparc.h,v 1.5 2000/01/26 05:56:44 momjian Exp $
- *
- *-------------------------------------------------------------------------
- */
-#ifndef PORT_PROTOS_H
-#define PORT_PROTOS_H
-
-#include <netinet/in.h>			/* For struct in_addr */
-#include <arpa/inet.h>
-
-#include <dlfcn.h>
-
-#include "fmgr.h"
-#include "utils/dynamic_loader.h"
-
-/* dynloader.c */
-/*
- * Dynamic Loader on SunOS 4.
- *
- * this dynamic loader uses the system dynamic loading interface for shared
- * libraries (ie. dlopen/dlsym/dlclose). The user must specify a shared
- * library as the file to be dynamically loaded.
- *
- */
-#define pg_dlopen(f)	dlopen(f,1)
-#define pg_dlsym		dlsym
-#define pg_dlclose		dlclose
-#define pg_dlerror		dlerror
-
-#endif	 /* PORT_PROTOS_H */