fixes for MSWGetCreateWindowFlags signature change

[wxWidgets.git] / src / common / dynload.cpp

diff --git a/src/common/dynload.cpp b/src/common/dynload.cpp
index 91cb64d3ebff73fbce30410f595874cd107af931..c88597a1b96a08752191b03a636dd0edf8426fa5 100644 (file)
--- a/src/common/dynload.cpp
+++ b/src/common/dynload.cpp
@@ -113,7 +113,7 @@ bool wxDynamicLibrary::Load(wxString libname, int flags)
 
 #elif defined(__WXPM__) || defined(__EMX__)
     char    err[256] = "";
 
 #elif defined(__WXPM__) || defined(__EMX__)
     char    err[256] = "";

-    DosLoadModule(err, sizeof(err), libname.c_str(), &m_handle)
+    DosLoadModule(err, sizeof(err), libname.c_str(), &m_handle);

 
 #elif defined(HAVE_DLOPEN)
 
 
 #elif defined(HAVE_DLOPEN)
 


@@ -183,7 +183,7 @@ bool wxDynamicLibrary::Load(wxString libname, int flags)
     if ( m_handle == 0 )
     {
         wxString msg(_("Failed to load shared library '%s'"));
     if ( m_handle == 0 )
     {
         wxString msg(_("Failed to load shared library '%s'"));

-#ifdef HAVE_DLERROR
+#if defined(HAVE_DLERROR) && !defined(__EMX__)

         const wxChar  *err = dlerror();
         if( err )
             wxLogError( msg, err );
         const wxChar  *err = dlerror();
         if( err )
             wxLogError( msg, err );


@@ -261,7 +261,7 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const
     if ( !symbol )
     {
         wxString msg(_("wxDynamicLibrary failed to GetSymbol '%s'"));
     if ( !symbol )
     {
         wxString msg(_("wxDynamicLibrary failed to GetSymbol '%s'"));

-#ifdef HAVE_DLERROR
+#if defined(HAVE_DLERROR) && !defined(__EMX__)

         const wxChar *err = dlerror();
         if( err )
         {
         const wxChar *err = dlerror();
         if( err )
         {