Committing in .

 Modified Files:
 	wxWindows/src/common/dynlib.cpp

 RTLD_GLOBAL is not allowed in the second argument of dlopen on True64-Unix.

----------------------------------------------------------------------

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 39c53cd2ee6eb0b3720f8c5d98ca97a7690ad9e9..5976df793dcb2739d35a13f401fd2215bf84a36e 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -53,9 +53,12 @@
     // note about dlopen() flags: we use RTLD_NOW to have more Windows-like
     // behaviour (Win won't let you load a library with missing symbols) and
     // RTLD_GLOBAL because it is needed sometimes and probably doesn't hurt
     // note about dlopen() flags: we use RTLD_NOW to have more Windows-like
     // behaviour (Win won't let you load a library with missing symbols) and
     // RTLD_GLOBAL because it is needed sometimes and probably doesn't hurt

-    // otherwise. On VMS the second argument on dlopen is ignored.
+    // otherwise. On True64-Unix RTLD_GLOBAL is not allowed and on VMS the
+    // second argument on dlopen is ignored.

 #ifdef __VMS
 # define wxDllOpen(lib)                dlopen(lib.fn_str(), 0 )
 #ifdef __VMS
 # define wxDllOpen(lib)                dlopen(lib.fn_str(), 0 )

+#elif defined( __osf__ )
+# define wxDllOpen(lib)                dlopen(lib.fn_str(), RTLD_LAZY )

 #else
 # define wxDllOpen(lib)                dlopen(lib.fn_str(), RTLD_LAZY | RTLD_GLOBAL)
 #endif
 #else
 # define wxDllOpen(lib)                dlopen(lib.fn_str(), RTLD_LAZY | RTLD_GLOBAL)
 #endif