Fix type mismatch in wxLogTrace() call in wxSocket.

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

diff --git a/src/common/time.cpp b/src/common/time.cpp
index ebc597d969f17713d4cb13aa36f011cbaa2ce3b7..4a76dfac4874a9d8c8f7685a53ee6b7a3d62320e 100644 (file)
--- a/src/common/time.cpp
+++ b/src/common/time.cpp
@@ -48,11 +48,6 @@
 #  endif
 #endif
 
 #  endif
 #endif
 

-#if defined(__MWERKS__) && defined(__WINDOWS__)
-#   undef HAVE_FTIME
-#   undef HAVE_GETTIMEOFDAY
-#endif
-

 #ifndef __WXWINCE__
 #include <time.h>
 #else
 #ifndef __WXWINCE__
 #include <time.h>
 #else


@@ -72,10 +67,6 @@
     #include <sys/timeb.h>
 #endif
 
     #include <sys/timeb.h>
 #endif
 

-#if defined(__MWERKS__) && wxUSE_UNICODE
-    #include <wtime.h>
-#endif
-

 #if defined(__DJGPP__) || defined(__WINE__)
     #include <sys/timeb.h>
     #include <values.h>
 #if defined(__DJGPP__) || defined(__WINE__)
     #include <sys/timeb.h>
     #include <values.h>


@@ -223,10 +214,6 @@ int wxGetTimeZone()
         return WX_TIMEZONE;
     #elif defined(__BORLANDC__) || defined(__MINGW32__) || defined(__VISAGECPP__)
         return _timezone;
         return WX_TIMEZONE;
     #elif defined(__BORLANDC__) || defined(__MINGW32__) || defined(__VISAGECPP__)
         return _timezone;

-    #elif defined(__MWERKS__)
-        // This is just plain wrong but apparently MetroWerks runtime didn't have
-        // any way to get the time zone.
-        return 28800;

     #else // unknown platform -- assume it has timezone
         return timezone;
     #endif // different time zone variables
     #else // unknown platform -- assume it has timezone
         return timezone;
     #endif // different time zone variables