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/solaris.h | |
parent | baa0bb97b0a6f40993a8e340b55b14c9317f60a1 (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/solaris.h')
-rw-r--r-- | src/backend/port/dynloader/solaris.h | 36 |
1 files changed, 30 insertions, 6 deletions
diff --git a/src/backend/port/dynloader/solaris.h b/src/backend/port/dynloader/solaris.h index ddb6b965b95..2f0c00e97b6 100644 --- a/src/backend/port/dynloader/solaris.h +++ b/src/backend/port/dynloader/solaris.h @@ -1,14 +1,38 @@ -/* $Header: /cvsroot/pgsql/src/backend/port/dynloader/solaris.h,v 1.7 2001/11/05 17:46:27 momjian Exp $ */ - -#ifndef DYNLOADER_SOLARIS_H -#define DYNLOADER_SOLARIS_H +/*------------------------------------------------------------------------- + * + * solaris.h + * port-specific prototypes for Solaris + * + * + * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group + * Portions Copyright (c) 1994, Regents of the University of California + * + * $Id: solaris.h,v 1.8 2002/02/12 23:40:53 tgl Exp $ + * + *------------------------------------------------------------------------- + */ +#ifndef PORT_PROTOS_H +#define PORT_PROTOS_H #include <dlfcn.h> #include "utils/dynamic_loader.h" -#define pg_dlopen(f) 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) dlopen((f), RTLD_NOW | RTLD_GLOBAL) #define pg_dlsym dlsym #define pg_dlclose dlclose #define pg_dlerror dlerror -#endif /* DYNLOADER_SOLARIS_H */ +#endif /* PORT_PROTOS_H */ |