Commit 8e3ccad1 authored by Thomas G. Lockhart's avatar Thomas G. Lockhart

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??
parent e447a467
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* *
* *
* IDENTIFICATION * 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 @@ ...@@ -23,6 +23,7 @@
#include "utils/elog.h" #include "utils/elog.h"
#include "fmgr.h" #include "fmgr.h"
#if FALSE
extern char pg_pathname[]; extern char pg_pathname[];
void * void *
...@@ -112,3 +113,4 @@ pg_dlerror() ...@@ -112,3 +113,4 @@ pg_dlerror()
return dld_strerror(dld_errno); return dld_strerror(dld_errno);
#endif #endif
} }
#endif
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* *
* port-protos.h-- * port-protos.h--
* port-specific prototypes for SunOS 4 * port-specific prototypes for Linux
* *
* *
* Copyright (c) 1994, Regents of the University of California * 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 @@ ...@@ -15,13 +15,13 @@
#include "fmgr.h" /* for func_ptr */ #include "fmgr.h" /* for func_ptr */
#include "utils/dynamic_loader.h" #include "utils/dynamic_loader.h"
#ifdef LINUX_ELF #ifdef __ELF__
#include "dlfcn.h" #include "dlfcn.h"
#endif #endif
/* dynloader.c */ /* dynloader.c */
#ifndef LINUX_ELF #ifndef __ELF__
#ifndef HAVE_DLD_H #ifndef HAVE_DLD_H
#define pg_dlsym(handle, funcname) (NULL) #define pg_dlsym(handle, funcname) (NULL)
#define pg_dlclose(handle) ({}) #define pg_dlclose(handle) ({})
...@@ -39,4 +39,4 @@ ...@@ -39,4 +39,4 @@
/* port.c */ /* port.c */
#endif /* PORT_PROTOS_H */ #endif /* PORT_PROTOS_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment