dlopen fixes

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

diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h
index 745cdddcd0eaeaefcb87135d4e4672ce723e91ce..0419db3579b7d0c287a1f652b6a1a3bd5c379839 100644 (file)
--- a/include/wx/dynlib.h
+++ b/include/wx/dynlib.h
@@ -20,6 +20,15 @@
 #include <wx/list.h>
 #include <wx/hash.h>
 
 #include <wx/list.h>
 #include <wx/hash.h>
 

+// TODO should be done by configure
+#if defined(__UNIX__) && !(defined(HAVE_DLOPEN) || defined(HAVE_SHLLOAD))
+    #if defined(__LINUX__) || defined(__SOLARIS__) || defined(__SUNOS__) || defined(__FREEBSD__)
+        #define HAVE_DLOPEN
+    #elif defined(__HPUX__)
+        #define HAVE_SHLLOAD
+    #endif // Unix flavour
+#endif // !Unix or already have some HAVE_xxx defined
+

 #if defined(HAVE_DLOPEN)
     #include <dlfcn.h>
 
 #if defined(HAVE_DLOPEN)
     #include <dlfcn.h>
 

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 57820da629098cdbd7667352ae472033d87d7072..ead9a1baef09c3791386aaea310a77a8395299a6 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -27,19 +27,6 @@
   #pragma hdrstop
 #endif  //__BORLANDC__
 
   #pragma hdrstop
 #endif  //__BORLANDC__
 

-// TODO should be done by configure
-#if defined(__UNIX__) && !(defined(HAVE_DLOPEN) || defined(HAVE_SHLLOAD))
-    #if defined(__LINUX__) || defined(__SOLARIS__) || defined(__SUNOS__) || defined(__FREEBSD__)
-        #ifndef HAVE_DLOPEN
-            #define HAVE_DLOPEN
-        #endif
-    #elif defined(__HPUX__)
-        #ifndef HAVE_SHLLOAD
-            #define HAVE_SHLLOAD
-        #endif
-    #endif // Unix flavour
-#endif // !Unix or already have some HAVE_xxx defined
-

 #include "wx/dynlib.h"
 #include "wx/filefn.h"
 #include "wx/intl.h"
 #include "wx/dynlib.h"
 #include "wx/filefn.h"
 #include "wx/intl.h"