Test for __ELF__ rather than LINUX_ELF in headers.

Thomas G. Lockhart · Thomas G. Lockhart · commit 8e3ccad12835 · 1998-01-01T06:02:04.000Z
Comment-out dynamic link function declarations since they are all
 provided by the system.
Should we bother continuing to support non-elf Linux systems??
diff --git 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
@@ -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 */

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $Header: /cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.2 1997/12/20 04:13:31 scrappy Exp $`
	`13`	`+ * $Header: /cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.3 1998/01/01 06:02:02 thomas Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -23,6 +23,7 @@`
`23`	`23`	`#include "utils/elog.h"`
`24`	`24`	`#include "fmgr.h"`
`25`	`25`
	`26`	`+#if FALSE`
`26`	`27`	`extern char pg_pathname[];`
`27`	`28`
`28`	`29`	`void *`
`@@ -112,3 +113,4 @@ pg_dlerror()`
`112`	`113`	`return dld_strerror(dld_errno);`
`113`	`114`	`#endif`
`114`	`115`	`}`
	`116`	`+#endif`