From f825dcd1231e438f8b4327b6a996e903a33c6b5c Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Tue, 9 Sep 2003 15:34:15 +0000 Subject: [PATCH] fix for CW non unicode builds git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/filefn.h | 2 +- include/wx/wxchar.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wx/filefn.h b/include/wx/filefn.h index 459e004132..1468e5b9bb 100644 --- a/include/wx/filefn.h +++ b/include/wx/filefn.h @@ -158,7 +158,7 @@ WXDLLIMPEXP_BASE int wxStat( const wxChar *file_name, wxStructStat *buf ); WXDLLIMPEXP_BASE int wxAccess( const wxChar *pathname, int mode ); WXDLLIMPEXP_BASE int wxOpen( const wxChar *pathname, int flags, mode_t mode ); #else -#if defined(__WXMAC__) && !defined(__DARWIN__) +#if defined(__WXMAC__) && !defined(__DARWIN__) && !defined(wxUSE_UNICODE) #include WXDLLIMPEXP_BASE int wxStat( const wxChar *file_name, wxStructStat *buf ); WXDLLIMPEXP_BASE int wxAccess( const wxChar *pathname, int mode ); diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h index c7e516acf3..d333148792 100644 --- a/include/wx/wxchar.h +++ b/include/wx/wxchar.h @@ -508,7 +508,7 @@ // time.h functions #define wxAsctime wasciitime #define wxCtime wctime - #define wxStrftime wcsftime + // #define wxStrftime wcsftime /* #define wxNEED_FPUTWC @@ -527,8 +527,8 @@ // use our own versions #define wxNEED_WX_STDIO_H #define wxNEED_WX_STDLIB_H - #define wxNEED_WX_TIME_H */ + #define wxNEED_WX_TIME_H #else // !metrowerks for apple #error "Please define wide character functions for your environment" #endif @@ -580,7 +580,7 @@ #define wxStrxfrm strxfrm // stdio.h functions - #if defined(__WXMAC__) && !defined(__DARWIN__) + #if defined(__WXMAC__) && !defined(__DARWIN__) && !defined(wxUSE_UNICODE) #include WXDLLIMPEXP_BASE FILE * wxFopen(const wxChar *path, const wxChar *mode); WXDLLIMPEXP_BASE FILE * wxFreopen(const wxChar *path, const wxChar *mode, FILE *stream);