added wxDP_ALLOWNONE (patch 1153889)

[wxWidgets.git] / src / common / string.cpp

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 672b5b143b2174d63a9cdbf479687665b33b08ee..764e1ff3b89a2535ffa28f671eeb901e9eb92fb6 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -42,7 +42,10 @@
 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>
+
+#ifndef __WXMSW__
 #include <errno.h>
+#endif
 
 #ifdef __SALFORDC__
   #include <clib.h>
@@ -1838,7 +1841,12 @@ int wxString::PrintfV(const wxChar* pszFormat, va_list argptr)
         // buffer were large enough
         // also, it may return an errno may be something like EILSEQ,
         // in which case we need to break out
-        if ( (len >= 0 && len <= size) || errno != EOVERFLOW )
+        if ( (len >= 0 && len <= size)
+        // No EOVERFLOW on Windows nor Palm 6.0
+#if !defined(__WXMSW__) && !defined(__WXPALMOS__)
+            || errno != EOVERFLOW
+#endif
+            )
         {
             // ok, there was enough space
             break;