aboutsummaryrefslogtreecommitdiff
path: root/src/backend/port/dynloader/netbsd.c
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2011-04-07 15:14:44 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2011-04-07 15:14:44 -0400
commitbb3051e4c2d7b42516d55925edefb4934b902374 (patch)
tree0d4880a530d2e4fb1d9077be175fc93f4b9532a7 /src/backend/port/dynloader/netbsd.c
parente2c946018fe27e5b21d8e2cd00d05f33b19709a4 (diff)
downloadpostgresql-bb3051e4c2d7b42516d55925edefb4934b902374.tar.gz
postgresql-bb3051e4c2d7b42516d55925edefb4934b902374.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/netbsd.c')
-rw-r--r--src/backend/port/dynloader/netbsd.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/backend/port/dynloader/netbsd.c b/src/backend/port/dynloader/netbsd.c
index b8dcfafec62..569624373ee 100644
--- a/src/backend/port/dynloader/netbsd.c
+++ b/src/backend/port/dynloader/netbsd.c
@@ -78,10 +78,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 != '_')
@@ -89,6 +89,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);