projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added __WXMAC_OSX__ guards around the CFRunLoop calls, CFRunLoop not available on...
[wxWidgets.git]
/
include
/
wx
/
wxchar.h
diff --git
a/include/wx/wxchar.h
b/include/wx/wxchar.h
index a47178e611ac5b5fe9f0619e2ecf9050e8527247..59d7a5e55b0d945c1b9c6e7d2033d330d8e06e50 100644
(file)
--- a/
include/wx/wxchar.h
+++ b/
include/wx/wxchar.h
@@
-20,6
+20,10
@@
#include "wx/defs.h" /* for wxUSE_UNICODE */
#include "wx/defs.h" /* for wxUSE_UNICODE */
+#if defined(HAVE_STRTOK_R) && defined(__DARWIN__) && defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS
+ char *strtok_r(char *, const char *, char **);
+#endif
+
/* check whether we have wchar_t and which size it is if we do */
#if !defined(wxUSE_WCHAR_T)
#if defined(__UNIX__)
/* check whether we have wchar_t and which size it is if we do */
#if !defined(wxUSE_WCHAR_T)
#if defined(__UNIX__)
@@
-369,7
+373,13
@@
#define wxAtoi _ttoi
#define wxAtol _ttol
/* #define wxAtof _tttof -- notice that there is no such thing (why?) */
#define wxAtoi _ttoi
#define wxAtol _ttol
/* #define wxAtof _tttof -- notice that there is no such thing (why?) */
- #define wxGetenv _tgetenv
+ /* there are no env vars at all under CE, so no _tgetenv neither */
+ #ifdef __WXWINCE__
+ /* can't define as inline function as this is a C file... */
+ #define wxGetenv(name) ((wxChar *)NULL)
+ #else
+ #define wxGetenv _tgetenv
+ #endif
#define wxSystem _tsystem
/* time.h functions */
#define wxSystem _tsystem
/* time.h functions */
@@
-768,7
+778,11
@@
WXDLLIMPEXP_BASE bool wxOKlibc(); /* for internal use */
headers, so we need to declare it ourselves to be able to use it.
*/
#if defined(HAVE_VSNPRINTF) && !defined(HAVE_VSNPRINTF_DECL)
headers, so we need to declare it ourselves to be able to use it.
*/
#if defined(HAVE_VSNPRINTF) && !defined(HAVE_VSNPRINTF_DECL)
+#ifdef __cplusplus
extern "C"
extern "C"
+#else
+ extern
+#endif
int vsnprintf(char *str, size_t size, const char *format, va_list ap);
#endif /* !HAVE_VSNPRINTF_DECL */
int vsnprintf(char *str, size_t size, const char *format, va_list ap);
#endif /* !HAVE_VSNPRINTF_DECL */