cleaning up problems after string changes

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

diff --git a/include/wx/wxcrt.h b/include/wx/wxcrt.h
index 5656e6348101e7b7da76e38ca6b8c23f6ce058c4..d4ebf7d49207f36458868bd249282b2064c7e2c8 100644 (file)
--- a/include/wx/wxcrt.h
+++ b/include/wx/wxcrt.h
@@ -586,10 +586,6 @@
     #endif /* Unicode/ASCII */
 #endif /* TCHAR-aware compilers/the others */
 
-#ifdef wxStrtoll
-    #define wxHAS_STRTOLL
-#endif
-
 /*
     various special cases
  */
@@ -748,6 +744,7 @@ WXDLLIMPEXP_BASE bool wxOKlibc(); /* for internal use */
     #ifndef wxVsnprintf_
         #if defined(__VISUALC__) || \
                 (defined(__BORLANDC__) && __BORLANDC__ >= 0x540)
+            #define wxSnprintf_     _sntprintf
             #define wxVsnprintf_    _vsntprintf
             WX_DEFINE_VARARG_FUNC(int, wxSnprintf_, _sntprintf)
         #endif
@@ -805,6 +802,14 @@ WXDLLIMPEXP_BASE bool wxOKlibc(); /* for internal use */
     #define wxUSE_WXVSNPRINTF 0
 #endif
 
+#ifndef wxStrtoll
+    /* supply strtoll and strtoull, if needed */
+    WXDLLIMPEXP_BASE wxLongLong_t wxStrtoll(const wxChar* nptr, wxChar** endptr, int base);
+    WXDLLIMPEXP_BASE wxULongLong_t wxStrtoull(const wxChar* nptr, wxChar** endptr, int base);
+#endif
+
+#define wxHAS_STRTOLL
+
 /*
    In Unicode mode we need to have all standard functions such as wprintf() and
    so on but not all systems have them so use our own implementations in this