More parameter variable names fixed to make them more readable by replacing abbreviat...

[wxWidgets.git] / include / wx / filefn.h

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index 97881ebb400849f15b694693482137c87d82d4b4..2428a97d299795cd6f15340141b52f3147498024 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -131,7 +131,6 @@ enum wxSeekMode
 // Implemented in filefnwce.cpp
 #if defined( __WXWINCE__)
     typedef __int64 wxFileOffset;
 // Implemented in filefnwce.cpp
 #if defined( __WXWINCE__)
     typedef __int64 wxFileOffset;

-    typedef unsigned __int64 wxFileSize_t;

     #define wxFileOffsetFmtSpec _("I64")
     int wxOpen(const wxChar *filename, int oflag, int WXUNUSED(pmode));
     int wxAccess(const wxChar *name, int WXUNUSED(how));
     #define wxFileOffsetFmtSpec _("I64")
     int wxOpen(const wxChar *filename, int oflag, int WXUNUSED(pmode));
     int wxAccess(const wxChar *name, int WXUNUSED(how));


@@ -174,7 +173,9 @@ enum wxSeekMode
 
     // detect compilers which have support for huge files (currently only
     // Digital Mars doesn't)
 
     // detect compilers which have support for huge files (currently only
     // Digital Mars doesn't)

+    #ifndef __WXPALMOS__

     #include "wx/msw/private.h"
     #include "wx/msw/private.h"

+    #endif

 
     #undef wxHAS_HUGE_FILES
     #if defined(__MINGW32__)
 
     #undef wxHAS_HUGE_FILES
     #if defined(__MINGW32__)


@@ -196,16 +197,9 @@ enum wxSeekMode
 
     #if wxHAS_HUGE_FILES
         typedef wxLongLong_t wxFileOffset;
 
     #if wxHAS_HUGE_FILES
         typedef wxLongLong_t wxFileOffset;

-        typedef unsigned wxLongLong_t wxFileSize_t;

         #define wxFileOffsetFmtSpec wxLongLongFmtSpec
     #else
         typedef off_t wxFileOffset;
         #define wxFileOffsetFmtSpec wxLongLongFmtSpec
     #else
         typedef off_t wxFileOffset;

-        #if defined(__DMC__)
-            typedef unsigned long wxFileSize_t;
-        #else
-            typedef unsigned off_t wxFileSize_t;
-        #endif
-        #define wxFileOffsetFmtSpec _("")

     #endif
 
     #define   wxClose      _close
     #endif
 
     #define   wxClose      _close


@@ -305,7 +299,7 @@ enum wxSeekMode
     #endif
 
     // constants (unless already defined by the user code)
     #endif
 
     // constants (unless already defined by the user code)

-    #if !defined(__BORLANDC__) && !defined(__WATCOMC__)
+    #if !defined(__BORLANDC__) && !defined(__WATCOMC__) && !defined(__WXPALMOS__)

         #ifndef O_RDONLY
             #define   O_RDONLY    _O_RDONLY
             #define   O_WRONLY    _O_WRONLY
         #ifndef O_RDONLY
             #define   O_RDONLY    _O_RDONLY
             #define   O_WRONLY    _O_WRONLY


@@ -330,10 +324,8 @@ enum wxSeekMode
         #define wxFileOffsetFmtSpec wxLongLongFmtSpec
         wxCOMPILE_TIME_ASSERT( sizeof(off_t) == sizeof(wxLongLong_t),
                                 BadFileSizeType );
         #define wxFileOffsetFmtSpec wxLongLongFmtSpec
         wxCOMPILE_TIME_ASSERT( sizeof(off_t) == sizeof(wxLongLong_t),
                                 BadFileSizeType );

-        typedef unsigned wxLongLong_t wxFileSize_t;

     #else
         #define wxFileOffsetFmtSpec _T("")
     #else
         #define wxFileOffsetFmtSpec _T("")

-        typedef unsigned long wxFileSize_t;

     #endif
     // functions
     #define   wxClose      close
     #endif
     // functions
     #define   wxClose      close


@@ -371,9 +363,9 @@ enum wxSeekMode
 // VisualAge C++ V4.0 cannot have any external linkage const decs
 // in headers included by more than one primary source
 //
 // VisualAge C++ V4.0 cannot have any external linkage const decs
 // in headers included by more than one primary source
 //

-extern const wxFileSize_t wxInvalidOffset;
+extern const int wxInvalidOffset;

 #else
 #else

-const wxFileSize_t wxInvalidOffset = (wxFileSize_t)-1;
+const int wxInvalidOffset = -1;

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------