dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r11744) -Codechange: don't redefine snprintf when using MinGW Runtime 3.14 or superior, as it now have snprintf() and vsnprintf conform to C99

Browse Source
This commit is contained in:
glx
2008-01-02 18:42:51 +00:00
parent 19f8990f64
commit 6f7f4adffc
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/string.cpp
View File

@@ -153,6 +153,8 @@ bool IsValidChar(WChar key, CharSetFilter afilter)
} }
#ifdef WIN32 #ifdef WIN32
/* Since version 3.14, MinGW Runtime has snprintf() and vsnprintf() conform to C99 but it's not the case for older versions */
#if (__MINGW32_MAJOR_VERSION < 3) || ((__MINGW32_MAJOR_VERSION == 3) && (__MINGW32_MINOR_VERSION < 14))
int CDECL snprintf(char *str, size_t size, const char *format, ...) int CDECL snprintf(char *str, size_t size, const char *format, ...)
{ {
va_list ap; va_list ap;
@@ -163,6 +165,7 @@ int CDECL snprintf(char *str, size_t size, const char *format, ...)
va_end(ap); va_end(ap);
return ret; return ret;
} }
#endif /* MinGW Runtime < 3.14 */
#ifdef _MSC_VER #ifdef _MSC_VER
/* *nprintf broken, not POSIX compliant, MSDN description /* *nprintf broken, not POSIX compliant, MSDN description