X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/93e0db9a80d880a15d3a8eb25c3db01f63392038..ae688b6468b9b00d109b4a60d51c6e2aeeef2317:/include/wx/filefn.h

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index 6848bbdeaf..298212e17d 100644
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -174,7 +174,9 @@ enum wxSeekMode
 
     // detect compilers which have support for huge files (currently only
     // Digital Mars doesn't)
+    #ifndef __PALMOS__
     #include "wx/msw/private.h"
+    #endif
 
     #undef wxHAS_HUGE_FILES
     #if defined(__MINGW32__)
@@ -200,8 +202,7 @@ enum wxSeekMode
         #define wxFileOffsetFmtSpec wxLongLongFmtSpec
     #else
         typedef off_t wxFileOffset;
-        typedef unsigned off_t wxFileSize_t;
-        #define wxFileOffsetFmtSpec _("")
+        typedef unsigned long wxFileSize_t;
     #endif
 
     #define   wxClose      _close
@@ -301,7 +302,7 @@ enum wxSeekMode
     #endif
 
     // constants (unless already defined by the user code)
-    #if !defined(__BORLANDC__) && !defined(__WATCOMC__)
+    #if !defined(__BORLANDC__) && !defined(__WATCOMC__) && !defined(__PALMOS__)
         #ifndef O_RDONLY
             #define   O_RDONLY    _O_RDONLY
             #define   O_WRONLY    _O_WRONLY
@@ -322,11 +323,14 @@ enum wxSeekMode
     #undef wxHAS_HUGE_FILES
 #else // Unix platforms using configure
     typedef off_t wxFileOffset;
-    typedef unsigned off_t wxFileSize_t;
     #ifdef _LARGE_FILES
         #define wxFileOffsetFmtSpec wxLongLongFmtSpec
+        wxCOMPILE_TIME_ASSERT( sizeof(off_t) == sizeof(wxLongLong_t),
+                                BadFileSizeType );
+        typedef unsigned wxLongLong_t wxFileSize_t;
     #else
         #define wxFileOffsetFmtSpec _T("")
+        typedef unsigned long wxFileSize_t;
     #endif
     // functions
     #define   wxClose      close