headers are now installed by automake too

[wxWidgets.git] / include / wx / dynlib.h

diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h
index 0419db3579b7d0c287a1f652b6a1a3bd5c379839..98bc1839a60e1c62607d3cedc4d4f1a8644f914a 100644 (file)
--- a/include/wx/dynlib.h
+++ b/include/wx/dynlib.h
@@ -16,16 +16,20 @@
     #pragma interface
 #endif
 
     #pragma interface
 #endif
 

+#include <wx/setup.h>
+
+#if wxUSE_DYNLIB_CLASS
+

 #include <wx/string.h>
 #include <wx/list.h>
 #include <wx/hash.h>
 
 #include <wx/string.h>
 #include <wx/list.h>
 #include <wx/hash.h>
 

-// TODO should be done by configure
-#if defined(__UNIX__) && !(defined(HAVE_DLOPEN) || defined(HAVE_SHLLOAD))
+// this is normally done by configure, but I leave it here for now...
+#if defined(__UNIX__) && !(defined(HAVE_DLOPEN) || defined(HAVE_SHL_LOAD))

     #if defined(__LINUX__) || defined(__SOLARIS__) || defined(__SUNOS__) || defined(__FREEBSD__)
         #define HAVE_DLOPEN
     #elif defined(__HPUX__)
     #if defined(__LINUX__) || defined(__SOLARIS__) || defined(__SUNOS__) || defined(__FREEBSD__)
         #define HAVE_DLOPEN
     #elif defined(__HPUX__)

-        #define HAVE_SHLLOAD
+        #define HAVE_SHL_LOAD

     #endif // Unix flavour
 #endif // !Unix or already have some HAVE_xxx defined
 
     #endif // Unix flavour
 #endif // !Unix or already have some HAVE_xxx defined
 


@@ -33,10 +37,10 @@
     #include <dlfcn.h>
 
     typedef void *wxDllType;
     #include <dlfcn.h>
 
     typedef void *wxDllType;

-#elif defined(HAVE_SHLLOAD)
+#elif defined(HAVE_SHL_LOAD)

     #include <dl.h>
 
     #include <dl.h>
 

-    typedef void *wxDllType;
+    typedef shl_t wxDllType;

 #elif defined(__WINDOWS__)
     #include <windows.h>
 
 #elif defined(__WINDOWS__)
     #include <windows.h>
 


@@ -62,7 +66,7 @@ public:
     wxHashTable classTable;
 
 public:
     wxHashTable classTable;
 
 public:

-    wxLibrary(void *handle);
+    wxLibrary(wxDllType handle);

     ~wxLibrary();
 
     // Get a symbol from the dynamic library
     ~wxLibrary();
 
     // Get a symbol from the dynamic library


@@ -112,4 +116,6 @@ wxClassInfo *wxGetClassFirst() { \
   return wxClassInfo::GetFirst(); \
 }
 
   return wxClassInfo::GetFirst(); \
 }
 

+#endif // wxUSE_DYNLIB_CLASS
+

 #endif // _WX_DYNLIB_H__
 #endif // _WX_DYNLIB_H__