diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2002-02-12 23:41:25 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2002-02-12 23:41:25 +0000 |
| commit | fa046b6a92431a91f91a981bb2995e7091552477 (patch) | |
| tree | 8048a4ce16e41b2d344ed468457d55e3b9989e5f /src/backend/port/dynloader/netbsd.h | |
| parent | baa0bb97b0a6f40993a8e340b55b14c9317f60a1 (diff) | |
| download | postgresql-fa046b6a92431a91f91a981bb2995e7091552477.tar.gz postgresql-fa046b6a92431a91f91a981bb2995e7091552477.zip | |
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/netbsd.h')
| -rw-r--r-- | src/backend/port/dynloader/netbsd.h | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/src/backend/port/dynloader/netbsd.h b/src/backend/port/dynloader/netbsd.h index 8310de4db2a..e01fd8f3334 100644 --- a/src/backend/port/dynloader/netbsd.h +++ b/src/backend/port/dynloader/netbsd.h @@ -1,13 +1,13 @@ /*------------------------------------------------------------------------- * - * port_protos.h - * port-specific prototypes for NetBSD 1.0 + * netbsd.h + * port-specific prototypes for NetBSD * * * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: netbsd.h,v 1.8 2001/11/05 17:46:27 momjian Exp $ + * $Id: netbsd.h,v 1.9 2002/02/12 23:40:37 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -21,7 +21,6 @@ #include "utils/dynamic_loader.h" -/* dynloader.c */ /* * Dynamic Loader on NetBSD 1.0. * @@ -34,7 +33,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 | RTLD_GLOBAL) + +/* + * 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 |