summaryrefslogtreecommitdiff
path: root/src/backend/port/dynloader/openbsd.h
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2002-02-12 23:41:25 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2002-02-12 23:41:25 +0000
commitfa046b6a92431a91f91a981bb2995e7091552477 (patch)
tree8048a4ce16e41b2d344ed468457d55e3b9989e5f /src/backend/port/dynloader/openbsd.h
parentbaa0bb97b0a6f40993a8e340b55b14c9317f60a1 (diff)
Use RTLD_NOW, not RTLD_LAZY, as binding mode for dlopen() on all platforms.
This restores the Linux behavior to what it was in PG 7.0 and 7.1, and causes other platforms to agree. (Other well-tested platforms like HPUX were doing it this way already.) Per pghackers discussion over the past month or so.
Diffstat (limited to 'src/backend/port/dynloader/openbsd.h')
-rw-r--r--src/backend/port/dynloader/openbsd.h22
1 files changed, 18 insertions, 4 deletions
diff --git a/src/backend/port/dynloader/openbsd.h b/src/backend/port/dynloader/openbsd.h
index 644b149b804..b68bb9d5873 100644
--- a/src/backend/port/dynloader/openbsd.h
+++ b/src/backend/port/dynloader/openbsd.h
@@ -1,11 +1,12 @@
/*-------------------------------------------------------------------------
*
- * Dynamic loader for OpenBSD
+ * openbsd.h
+ * port-specific prototypes for OpenBSD
*
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: openbsd.h,v 1.9 2001/11/05 17:46:27 momjian Exp $
+ * $Id: openbsd.h,v 1.10 2002/02/12 23:40:40 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -19,7 +20,6 @@
#include "utils/dynamic_loader.h"
-/* dynloader.c */
/*
* Dynamic Loader on NetBSD 1.0.
*
@@ -32,7 +32,21 @@
* begin with an underscore is fairly tricky, and some versions of
* NetBSD (like 1.0, and 1.0A pre June 1995) have no dlerror.)
*/
-#define pg_dlopen(f) BSD44_derived_dlopen((f), RTLD_LAZY)
+
+/*
+ * In some older systems, the RTLD_NOW flag isn't defined and the mode
+ * argument to dlopen must always be 1. The RTLD_GLOBAL flag is wanted
+ * if available, but it doesn't exist everywhere.
+ * If it doesn't exist, set it to 0 so it has no effect.
+ */
+#ifndef RTLD_NOW
+#define RTLD_NOW 1
+#endif
+#ifndef RTLD_GLOBAL
+#define RTLD_GLOBAL 0
+#endif
+
+#define pg_dlopen(f) BSD44_derived_dlopen((f), RTLD_NOW | RTLD_GLOBAL)
#define pg_dlsym BSD44_derived_dlsym
#define pg_dlclose BSD44_derived_dlclose
#define pg_dlerror BSD44_derived_dlerror