From 2cea31c5441292cdea41e89c61524bbbab85cdbf Mon Sep 17 00:00:00 2001
From: Tino Reichardt <milky-7zip@mcmilk.de>
Date: Sun, 18 Jun 2017 14:11:36 +0200
Subject: [PATCH] add msvc compiling fixes for zstdmt

---
 C/zstdmt/brotli-mt_common.c | 1 +
 C/zstdmt/lizard-mt_common.c | 3 ++-
 C/zstdmt/lz4-mt_common.c    | 3 ++-
 C/zstdmt/lz5-mt_common.c    | 3 ++-
 C/zstdmt/threading.c        | 4 +++-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/C/zstdmt/brotli-mt_common.c b/C/zstdmt/brotli-mt_common.c
index 8b23f197..e0322f00 100644
--- a/C/zstdmt/brotli-mt_common.c
+++ b/C/zstdmt/brotli-mt_common.c
@@ -32,6 +32,7 @@ unsigned BROTLIMT_isError(size_t code)
 const char *BROTLIMT_getErrorString(size_t code)
 {
 	static const char *noErrorCode = "Unspecified brotli error code";
+
 	switch ((BROTLIMT_ErrorCode) (0 - code)) {
 	case PREFIX(no_error):
 		return "No error detected";
diff --git a/C/zstdmt/lizard-mt_common.c b/C/zstdmt/lizard-mt_common.c
index 598a0d36..7d7b9c78 100644
--- a/C/zstdmt/lizard-mt_common.c
+++ b/C/zstdmt/lizard-mt_common.c
@@ -32,10 +32,11 @@ unsigned LIZARDMT_isError(size_t code)
  */
 const char *LIZARDMT_getErrorString(size_t code)
 {
+	static const char *noErrorCode = "Unspecified lizardmt error code";
+
 	if (LizardF_isError(lizardmt_errcode))
 		return LizardF_getErrorName(lizardmt_errcode);
 
-	static const char *noErrorCode = "Unspecified lizardmt error code";
 	switch ((LIZARDMT_ErrorCode) (0 - code)) {
 	case PREFIX(no_error):
 		return "No error detected";
diff --git a/C/zstdmt/lz4-mt_common.c b/C/zstdmt/lz4-mt_common.c
index 957c0fca..e8b1a548 100644
--- a/C/zstdmt/lz4-mt_common.c
+++ b/C/zstdmt/lz4-mt_common.c
@@ -32,10 +32,11 @@ unsigned LZ4MT_isError(size_t code)
  */
 const char *LZ4MT_getErrorString(size_t code)
 {
+	static const char *noErrorCode = "Unspecified lz4mt error code";
+
 	if (LZ4F_isError(lz4mt_errcode))
 		return LZ4F_getErrorName(lz4mt_errcode);
 
-	static const char *noErrorCode = "Unspecified lz4mt error code";
 	switch ((LZ4MT_ErrorCode) (0 - code)) {
 	case PREFIX(no_error):
 		return "No error detected";
diff --git a/C/zstdmt/lz5-mt_common.c b/C/zstdmt/lz5-mt_common.c
index b973ae0a..d0ccf684 100644
--- a/C/zstdmt/lz5-mt_common.c
+++ b/C/zstdmt/lz5-mt_common.c
@@ -32,10 +32,11 @@ unsigned LZ5MT_isError(size_t code)
  */
 const char *LZ5MT_getErrorString(size_t code)
 {
+	static const char *noErrorCode = "Unspecified lz5mt error code";
+
 	if (LZ5F_isError(lz5mt_errcode))
 		return LZ5F_getErrorName(lz5mt_errcode);
 
-	static const char *noErrorCode = "Unspecified lz5mt error code";
 	switch ((LZ5MT_ErrorCode) (0 - code)) {
 	case PREFIX(no_error):
 		return "No error detected";
diff --git a/C/zstdmt/threading.c b/C/zstdmt/threading.c
index c8882520..f93ebc97 100644
--- a/C/zstdmt/threading.c
+++ b/C/zstdmt/threading.c
@@ -52,10 +52,12 @@ pthread_create(pthread_t * thread, const void *unused,
 
 int _pthread_join(pthread_t * thread, void **value_ptr)
 {
+	DWORD result;
+
 	if (!thread->handle)
 		return 0;
 
-	DWORD result = WaitForSingleObject(thread->handle, INFINITE);
+	result = WaitForSingleObject(thread->handle, INFINITE);
 	switch (result) {
 	case WAIT_OBJECT_0:
 		if (value_ptr)