diff --git a/lib/libwebsockets.h b/lib/libwebsockets.h index 96e1c900..2cb9bc6e 100644 --- a/lib/libwebsockets.h +++ b/lib/libwebsockets.h @@ -95,18 +95,10 @@ typedef unsigned long long lws_intptr_t; #define LWS_O_CREAT _O_CREAT #define LWS_O_TRUNC _O_TRUNC -#if !defined(__MINGW32__) && (!defined(_MSC_VER) || _MSC_VER < 1900) /* Visual Studio 2015 already defines this in */ -#define lws_snprintf _snprintf -#endif - #ifndef __func__ #define __func__ __FUNCTION__ #endif -#if !defined(__MINGW32__) &&(!defined(_MSC_VER) || _MSC_VER < 1900) && !defined(snprintf) -#define snprintf(buf,len, format,...) _snprintf_s(buf, len,len, format, __VA_ARGS__) -#endif - #else /* NOT WIN32 */ #include #if defined(LWS_HAVE_SYS_CAPABILITY_H) && defined(LWS_HAVE_LIBCAP) diff --git a/plugins/protocol_lws_sshd_demo.c b/plugins/protocol_lws_sshd_demo.c index f5665340..fdc8a6ac 100644 --- a/plugins/protocol_lws_sshd_demo.c +++ b/plugins/protocol_lws_sshd_demo.c @@ -335,12 +335,12 @@ ssh_ops_shell(void *_priv, struct lws *wsi, lws_ssh_finish_exec finish, void *fi static size_t ssh_ops_banner(char *buf, size_t max_len, char *lang, size_t max_lang_len) { - int n = snprintf(buf, max_len, "\n" + int n = lws_snprintf(buf, max_len, "\n" " |\\---/| lws-ssh Test Server\n" " | o_o | SSH Terminal Server\n" " \\_^_/ Copyright (C) 2017 Crash Barrier Ltd\n\n"); - snprintf(lang, max_lang_len, "en/US"); + lws_snprintf(lang, max_lang_len, "en/US"); return n; } diff --git a/test-apps/test-sshd.c b/test-apps/test-sshd.c index 27f0f38d..26c1353e 100644 --- a/test-apps/test-sshd.c +++ b/test-apps/test-sshd.c @@ -578,12 +578,12 @@ ssh_ops_shell(void *_priv, struct lws *wsi, lws_ssh_finish_exec finish, void *fi static size_t ssh_ops_banner(char *buf, size_t max_len, char *lang, size_t max_lang_len) { - int n = snprintf(buf, max_len, "\n" + int n = lws_snprintf(buf, max_len, "\n" " |\\---/| lws-ssh Test Server\n" " | o_o | SSH Terminal Server\n" " \\_^_/ Copyright (C) 2017 Crash Barrier Ltd\n\n"); - snprintf(lang, max_lang_len, "en/US"); + lws_snprintf(lang, max_lang_len, "en/US"); return n; }