Applied patch [ 856318 ] A few Wine fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 11:06:56 +00:00
parent 47831c68b6
commit cd2a4e161d
8 changed files with 10 additions and 44 deletions
--- a/src/common/imagjpeg.cpp
+++ b/src/common/imagjpeg.cpp
@@ -40,6 +40,9 @@

 extern "C"
 {
+    #if defined(__WXMSW__)
+        #define XMD_H
+    #endif
    #include "jpeglib.h"
 }

--- a/src/common/stopwatch.cpp
+++ b/src/common/stopwatch.cpp
@@ -250,7 +250,7 @@ wxLongLong wxGetLocalTimeMillis()
    // If possible, use a function which avoids conversions from
    // broken-up time structures to milliseconds

-#if defined(__WXMSW__) && defined(__MWERKS__)
+#if defined(__WXMSW__) && (defined(__WINE__) || defined(__MWERKS__))
    // This should probably be the way all WXMSW compilers should do it
    // Go direct to the OS for time