X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e02e8816c7a9be2082f914f6d53fcdba0d7d5416..390015c0ee28d25b0b7e23c42a52733adcac334f:/include/wx/filefn.h diff --git a/include/wx/filefn.h b/include/wx/filefn.h index e590ff3fe8..45e3648086 100644 --- a/include/wx/filefn.h +++ b/include/wx/filefn.h @@ -12,7 +12,7 @@ #ifndef _FILEFN_H_ #define _FILEFN_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "filefn.h" #endif @@ -81,23 +81,23 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString; #if wxUSE_UNICODE #if wxUSE_UNICODE_MSLU - WXDLLEXPORT int wxOpen(const wxChar *name, int flags, int mode); + #define wxOpen wxMSLU__wopen + #define wxAccess wxMSLU__waccess + #define wxMkDir wxMSLU__wmkdir + #define wxRmDir wxMSLU__wrmdir + #define wxStat wxMSLU__wstat #else #define wxOpen _wopen + #define wxAccess _waccess + #define wxMkDir _wmkdir + #define wxRmDir _wrmdir + #define wxStat _wstat #endif - #define wxAccess _waccess - - #define wxMkDir _wmkdir - #define wxRmDir _wrmdir - - #define wxStat _wstat #else // !wxUSE_UNICODE #define wxOpen _open #define wxAccess _access - #define wxMkDir _mkdir #define wxRmDir _rmdir - #define wxStat _stat #endif @@ -119,13 +119,11 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString; #endif // O_RDONLY #else // functions - #define wxOpen open #define wxClose close #define wxRead read #define wxWrite write #define wxLseek lseek #define wxFsync commit - #define wxAccess access #define wxEof eof #define wxMkDir mkdir @@ -133,10 +131,18 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString; #define wxTell(fd) lseek(fd, 0, SEEK_CUR) - #define wxStat stat - - // types #define wxStructStat struct stat + +#if wxUSE_UNICODE +# define wxNEED_WX_UNISTD_H +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 ); +#else + #define wxOpen open + #define wxStat stat + #define wxAccess access +#endif #endif // VC++