diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2011-04-07 15:15:00 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2011-04-07 15:15:00 -0400 |
| commit | 1de4b9afe66acf6dccd129cb0267e0496e938b0f (patch) | |
| tree | 816dfeb80f76fcd0e5fa58fe75baebb523e52625 /src | |
| parent | 00a922906073314f9ba000c933eb6d2308c0a162 (diff) | |
| download | postgresql-1de4b9afe66acf6dccd129cb0267e0496e938b0f.tar.gz postgresql-1de4b9afe66acf6dccd129cb0267e0496e938b0f.zip | |
Modernize dlopen interface code for FreeBSD and OpenBSD.
Remove the hard-wired assumption that __mips__ (and only __mips__) lacks
dlopen in FreeBSD and OpenBSD. This assumption is outdated at least for
OpenBSD, as per report from an anonymous 9.1 tester. We can perfectly well
use HAVE_DLOPEN instead to decide which code to use.
Some other cosmetic adjustments to make freebsd.c, netbsd.c, and openbsd.c
exactly alike.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/port/dynloader/freebsd.c | 9 | ||||
| -rw-r--r-- | src/backend/port/dynloader/netbsd.c | 5 | ||||
| -rw-r--r-- | src/backend/port/dynloader/openbsd.c | 12 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/backend/port/dynloader/freebsd.c b/src/backend/port/dynloader/freebsd.c index 71e11906e52..773e3b7b407 100644 --- a/src/backend/port/dynloader/freebsd.c +++ b/src/backend/port/dynloader/freebsd.c @@ -61,7 +61,7 @@ BSD44_derived_dlerror(void) void * BSD44_derived_dlopen(const char *file, int num) { -#if defined(__mips__) +#if !defined(HAVE_DLOPEN) snprintf(error_message, sizeof(error_message), "dlopen (%s) not supported", file); return NULL; @@ -78,7 +78,7 @@ BSD44_derived_dlopen(const char *file, int num) void * BSD44_derived_dlsym(void *handle, const char *name) { -#if defined(__mips__) +#if !defined(HAVE_DLOPEN) snprintf(error_message, sizeof(error_message), "dlsym (%s) failed", name); return NULL; @@ -93,7 +93,7 @@ BSD44_derived_dlsym(void *handle, const char *name) snprintf(buf, sizeof(buf), "_%s", name); name = buf; } -#endif +#endif /* !__ELF__ */ if ((vp = dlsym(handle, (char *) name)) == NULL) snprintf(error_message, sizeof(error_message), "dlsym (%s) failed", name); @@ -104,8 +104,7 @@ BSD44_derived_dlsym(void *handle, const char *name) void BSD44_derived_dlclose(void *handle) { -#if defined(__mips__) -#else +#if defined(HAVE_DLOPEN) dlclose(handle); #endif } diff --git a/src/backend/port/dynloader/netbsd.c b/src/backend/port/dynloader/netbsd.c index 5c80f59c986..5197c911e2c 100644 --- a/src/backend/port/dynloader/netbsd.c +++ b/src/backend/port/dynloader/netbsd.c @@ -82,10 +82,10 @@ BSD44_derived_dlsym(void *handle, const char *name) snprintf(error_message, sizeof(error_message), "dlsym (%s) failed", name); return NULL; -#elif defined(__ELF__) - return dlsym(handle, name); #else void *vp; + +#ifndef __ELF__ char buf[BUFSIZ]; if (*name != '_') @@ -93,6 +93,7 @@ BSD44_derived_dlsym(void *handle, const char *name) snprintf(buf, sizeof(buf), "_%s", name); name = buf; } +#endif /* !__ELF__ */ if ((vp = dlsym(handle, (char *) name)) == NULL) snprintf(error_message, sizeof(error_message), "dlsym (%s) failed", name); diff --git a/src/backend/port/dynloader/openbsd.c b/src/backend/port/dynloader/openbsd.c index 196245b3089..d4e92d75aa2 100644 --- a/src/backend/port/dynloader/openbsd.c +++ b/src/backend/port/dynloader/openbsd.c @@ -61,7 +61,7 @@ BSD44_derived_dlerror(void) void * BSD44_derived_dlopen(const char *file, int num) { -#if defined(__mips__) +#if !defined(HAVE_DLOPEN) snprintf(error_message, sizeof(error_message), "dlopen (%s) not supported", file); return NULL; @@ -78,14 +78,14 @@ BSD44_derived_dlopen(const char *file, int num) void * BSD44_derived_dlsym(void *handle, const char *name) { -#if defined(__mips__) +#if !defined(HAVE_DLOPEN) snprintf(error_message, sizeof(error_message), "dlsym (%s) failed", name); return NULL; -#elif defined(__ELF__) - return dlsym(handle, name); #else void *vp; + +#ifndef __ELF__ char buf[BUFSIZ]; if (*name != '_') @@ -93,6 +93,7 @@ BSD44_derived_dlsym(void *handle, const char *name) snprintf(buf, sizeof(buf), "_%s", name); name = buf; } +#endif /* !__ELF__ */ if ((vp = dlsym(handle, (char *) name)) == NULL) snprintf(error_message, sizeof(error_message), "dlsym (%s) failed", name); @@ -103,8 +104,7 @@ BSD44_derived_dlsym(void *handle, const char *name) void BSD44_derived_dlclose(void *handle) { -#if defined(__mips__) -#else +#if defined(HAVE_DLOPEN) dlclose(handle); #endif } |