From 8e3ccad128357016c4fd8838f113eb00e22e8e7a Mon Sep 17 00:00:00 2001
From: "Thomas G. Lockhart" <lockhart@fourpalms.org>
Date: Thu, 1 Jan 1998 06:02:04 +0000
Subject: [PATCH] Test for __ELF__ rather than LINUX_ELF in headers.
 Comment-out dynamic link function declarations since they are all  provided
 by the system. Should we bother continuing to support non-elf Linux systems??

---
 src/backend/port/dynloader/linux.c |  4 +++-
 src/backend/port/dynloader/linux.h | 10 +++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/backend/port/dynloader/linux.c b/src/backend/port/dynloader/linux.c
index 63efe7c9d3..b88b330cdd 100644
--- a/src/backend/port/dynloader/linux.c
+++ b/src/backend/port/dynloader/linux.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.2 1997/12/20 04:13:31 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.3 1998/01/01 06:02:02 thomas Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,6 +23,7 @@
 #include "utils/elog.h"
 #include "fmgr.h"
 
+#if FALSE
 extern char pg_pathname[];
 
 void	   *
@@ -112,3 +113,4 @@ pg_dlerror()
 	return dld_strerror(dld_errno);
 #endif
 }
+#endif
diff --git a/src/backend/port/dynloader/linux.h b/src/backend/port/dynloader/linux.h
index 63a8acec7d..148a0ce1da 100644
--- a/src/backend/port/dynloader/linux.h
+++ b/src/backend/port/dynloader/linux.h
@@ -1,12 +1,12 @@
 /*-------------------------------------------------------------------------
  *
  * port-protos.h--
- *	  port-specific prototypes for SunOS 4
+ *	  port-specific prototypes for Linux
  *
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: linux.h,v 1.1 1997/12/20 02:36:18 scrappy Exp $
+ * $Id: linux.h,v 1.2 1998/01/01 06:02:04 thomas Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,13 +15,13 @@
 
 #include "fmgr.h"				/* for func_ptr */
 #include "utils/dynamic_loader.h"
-#ifdef LINUX_ELF
+#ifdef __ELF__
 #include "dlfcn.h"
 #endif
 
 /* dynloader.c */
 
-#ifndef LINUX_ELF
+#ifndef __ELF__
 #ifndef HAVE_DLD_H
 #define pg_dlsym(handle, funcname)		(NULL)
 #define pg_dlclose(handle)			   ({})
@@ -39,4 +39,4 @@
 
 /* port.c */
 
-#endif							/* PORT_PROTOS_H */
+#endif /* PORT_PROTOS_H */