diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2011-04-07 15:14:51 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2011-04-07 15:14:51 -0400 |
| commit | d5b9c9f7335d87dfa3adf171e7a00c8c6cd9b62f (patch) | |
| tree | 3e421bab59bde33ff3f1b8d9b8e2c2c2ad03164e /src/backend/port/dynloader/freebsd.c | |
| parent | 5d3853a7fa40b28b44b14084863fd83a188c9a9e (diff) | |
| download | postgresql-d5b9c9f7335d87dfa3adf171e7a00c8c6cd9b62f.tar.gz postgresql-d5b9c9f7335d87dfa3adf171e7a00c8c6cd9b62f.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/backend/port/dynloader/freebsd.c')
| -rw-r--r-- | src/backend/port/dynloader/freebsd.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/backend/port/dynloader/freebsd.c b/src/backend/port/dynloader/freebsd.c index b90d5beb04d..b4000af489a 100644 --- a/src/backend/port/dynloader/freebsd.c +++ b/src/backend/port/dynloader/freebsd.c @@ -57,7 +57,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; @@ -74,7 +74,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; @@ -89,7 +89,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); @@ -100,8 +100,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 } |