X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c1a88d8b8518eda184be388723f46cfd54c3ac6..794bcc2dea743ac907b839f54e451847c9ea4b72:/include/wx/dynlib.h?ds=sidebyside

diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h
index 2ba2c3f4b6..313180829c 100644
--- a/include/wx/dynlib.h
+++ b/include/wx/dynlib.h
@@ -33,7 +33,13 @@
 #   endif // Unix flavour
 #endif // !Unix or already have some HAVE_xxx defined
 
-#if defined(HAVE_DLOPEN)
+// Note: WXPM/EMX has to be tested first, since we want to use
+// native version, even if configure detected presence of DLOPEN.
+#if defined(__WXPM__) || defined(__EMX__)
+#   define INCL_DOS
+#   include <os2.h>
+    typedef HMODULE wxDllType;
+#elif defined(HAVE_DLOPEN)
 #   include <dlfcn.h>
     typedef void *wxDllType;
 #elif defined(HAVE_SHL_LOAD)
@@ -42,10 +48,6 @@
 #elif defined(__WINDOWS__)
 #   include <windows.h>         // needed to get HMODULE
     typedef HMODULE wxDllType;
-#elif defined(__OS2__)
-#   define INCL_DOS
-#   include <os2.h>
-    typedef HMODULE wxDllType;
 #elif defined(__WXMAC__)
     typedef CFragConnectionID wxDllType;
 #else