Output deprecated warning for --rezflags and permanently disable it.

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

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 12c4204759d9302c8f1d18e3545589bdf3a0c544..c2abb44c199f66bed3f20588f222ddae563a9827 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -39,10 +39,6 @@
 #include <string.h>
 #include <stdlib.h>
 
 #include <string.h>
 #include <stdlib.h>
 

-#ifndef __WXMSW__
-#include <errno.h>
-#endif
-

 #ifdef __SALFORDC__
   #include <clib.h>
 #endif
 #ifdef __SALFORDC__
   #include <clib.h>
 #endif


@@ -1839,23 +1835,13 @@ int wxString::PrintfV(const wxChar* pszFormat, va_list argptr)
 
         // vsnprintf() may return either -1 (traditional Unix behaviour) or the
         // total number of characters which would have been written if the
 
         // vsnprintf() may return either -1 (traditional Unix behaviour) or the
         // total number of characters which would have been written if the

-        // buffer were large enough
+        // buffer were large enough (newer standards such as Unix98)

         if ( len >= 0 && len <= size )
         {
             // ok, there was enough space
             break;
         }
 
         if ( len >= 0 && len <= size )
         {
             // ok, there was enough space
             break;
         }
 

-#ifdef EOVERFLOW
-        // if the error is not due to not having enough space (it could be e.g.
-        // EILSEQ), break too -- we'd just eat all available memory uselessly
-        if ( errno != EOVERFLOW )
-        {
-            // no sense in continuing
-            break;
-        }
-#endif // EOVERFLOW
-

         // still not enough, double it again
         size *= 2;
     }
         // still not enough, double it again
         size *= 2;
     }