From 3d2c58c3a9e86e76c97e122867e1b6952a229c31 Mon Sep 17 00:00:00 2001
From: inikep <inikep@gmail.com>
Date: Wed, 10 Aug 2016 14:28:47 +0200
Subject: [PATCH] fixed compilation with Visual in C++ mode

---
 programs/datagen.c             | 6 ++++--
 zlibWrapper/zstd_zlibwrapper.c | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/programs/datagen.c b/programs/datagen.c
index 6cb5111ff..d1fb858a3 100644
--- a/programs/datagen.c
+++ b/programs/datagen.c
@@ -26,8 +26,10 @@
 /* *************************************
 *  Compiler Options
 ***************************************/
-#define _CRT_SECURE_NO_WARNINGS  /* removes Visual warning on strerror() */
-
+#if defined(_MSC_VER)
+#  define _CRT_SECURE_NO_WARNINGS    /* removes Visual warning on strerror() */
+#  define _CRT_SECURE_NO_DEPRECATE   /* removes VS2005 warning on strerror() */
+#endif
 
 /*-************************************
 *  Dependencies
diff --git a/zlibWrapper/zstd_zlibwrapper.c b/zlibWrapper/zstd_zlibwrapper.c
index 06667b610..34de73a6d 100644
--- a/zlibWrapper/zstd_zlibwrapper.c
+++ b/zlibWrapper/zstd_zlibwrapper.c
@@ -29,14 +29,15 @@
     - zstd source repository : https://github.com/Cyan4973/zstd
 */
 
-#include <stdarg.h>            /* va_list, for z_gzprintf */
+#include <stdio.h>                 /* vsprintf */
+#include <stdarg.h>                /* va_list, for z_gzprintf */
 #include <zlib.h>
 #include "zstd_zlibwrapper.h"
 #define ZSTD_STATIC_LINKING_ONLY   /* ZSTD_MAGICNUMBER */
 #include "zstd.h"
 #define ZBUFF_STATIC_LINKING_ONLY  /* ZBUFF_createCCtx_advanced */
 #include "zbuff.h"
-#include "zstd_internal.h"     /* defaultCustomMem */
+#include "zstd_internal.h"         /* defaultCustomMem */
 
 
 #define Z_INFLATE_SYNC              8