no changes, just resolved a conflict

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

diff --git a/src/common/file.cpp b/src/common/file.cpp
index 637d450da530548d19e9e4f8c4b5f36cae642e59..d8f53811f07389999abd68e364602d5d2c0c50ef 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -58,9 +58,10 @@
     // TODO: what to include?
 #elif (defined(__UNIX__) || defined(__GNUWIN32__))
     #include  <unistd.h>
+    #include  <time.h>
     #include  <sys/stat.h>
     #ifdef __GNUWIN32__
-        #include <windows.h>
+        #include "wx/msw/wrapwin.h"
     #endif
 #elif defined(__DOS__)
     #if defined(__WATCOMC__)