diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-06-15 10:52:53 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2018-06-26 22:30:50 +0000 |
| commit | fe94133f0d06935bb5f2afe21f59bbb078d3d9d3 (patch) | |
| tree | 8da435b8feeb134699837e8e88fcb7f626936431 /wsutil/ws_printf.h | |
| parent | c68a1f049e3725240872639e75ad52b89c24cc01 (diff) | |
Remove code specific to older versions of Visual Studio.
Remove -DBUILD_WINDOWS and sections of code that we no longer use.
Bug: 14715
Change-Id: Iae1a950e2f52f4ce45fcf0ae5dea06c1172c3a28
Reviewed-on: https://code.wireshark.org/review/28466
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'wsutil/ws_printf.h')
| -rw-r--r-- | wsutil/ws_printf.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/wsutil/ws_printf.h b/wsutil/ws_printf.h index d603f815df..2f12a03083 100644 --- a/wsutil/ws_printf.h +++ b/wsutil/ws_printf.h @@ -25,22 +25,6 @@ extern "C" { #ifdef _WIN32 #include <strsafe.h> -#if _MSC_VER < 1900 -#include <stdarg.h> - -/* - * vsnprintf_s's return value isn't compatible with C99 vsnprintf. We don't - * return anything in order to avoid confusion. - */ - -static __inline void -ws_vsnprintf(char *buffer, size_t size_of_buffer, const char *format, va_list argptr) { - /* We could alternatively use StringCchVPrintfA */ - vsnprintf_s(buffer, size_of_buffer, _TRUNCATE, format, argptr); -} - -#else /* _MSC_VER uses UCRT */ - /* The UCRT versions of snprintf and vsnprintf conform to C99 */ static __inline void @@ -49,8 +33,6 @@ ws_vsnprintf(char *buffer, size_t size_of_buffer, const char *format, va_list ar vsnprintf(buffer, size_of_buffer, format, argptr); } -#endif /* _MSC_VER */ - #else /* _WIN32 */ #include <glib.h> |