X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..ddea7eb61476571b80c2f52c2689680229595fec:/include/wx/filefn.h diff --git a/include/wx/filefn.h b/include/wx/filefn.h index b6d2f0087f..75313630d8 100644 --- a/include/wx/filefn.h +++ b/include/wx/filefn.h @@ -6,7 +6,7 @@ // Created: 29/01/98 // RCS-ID: $Id$ // Copyright: (c) 1998 Julian Smart -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _FILEFN_H_ @@ -18,14 +18,20 @@ #include "wx/list.h" +#ifndef __WXWINCE__ #include +#endif // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- +#ifdef __WXWINCE__ + typedef long off_t; +#else + // define off_t -#if !defined(__WXMAC__) || defined(__UNIX__) +#if !defined(__WXMAC__) || defined(__UNIX__) || defined(__MACH__) #include #else typedef long off_t; @@ -37,10 +43,12 @@ typedef long off_t; #elif defined(__SC__) typedef long off_t; -#elif defined(__MWERKS__) && !defined(__INTEL__) +#elif defined(__MWERKS__) && !defined(__INTEL__) && !defined(__MACH__) typedef long off_t; #endif +#endif + #if defined(__VISAGECPP__) && __IBMCPP__ >= 400 // // VisualAge C++ V4.0 cannot have any external linkage const decs @@ -67,7 +75,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString; // Microsoft compiler loves underscores, feed them to it #if defined( __VISUALC__ ) \ - || ( defined(__MINGW32__) && wxCHECK_W32API_VERSION( 0, 5 ) ) \ + || ( defined(__MINGW32__) && !defined(__WINE__) && wxCHECK_W32API_VERSION( 0, 5 ) ) \ || ( defined(__MWERKS__) && defined(__WXMSW__) ) // functions #define wxClose _close @@ -135,6 +143,9 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString; #if wxUSE_UNICODE # define wxNEED_WX_UNISTD_H +#if defined(__MWERKS__) && defined(macintosh) + #include +#endif WXDLLEXPORT int wxStat( const wxChar *file_name, wxStructStat *buf ); WXDLLEXPORT int wxAccess( const wxChar *pathname, int mode ); WXDLLEXPORT int wxOpen( const wxChar *pathname, int flags, mode_t mode );