From: Nick Terrell <terrelln@fb.com>
Date: Tue, 29 Aug 2017 18:54:38 +0000 (-0700)
Subject: [error] Don't guard undef X with ifdef X
X-Git-Tag: fuzz-corpora2~41^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9822f97721e472d711f8e28c7304dac379ccdfb6;p=thirdparty%2Fzstd.git

[error] Don't guard undef X with ifdef X
---

diff --git a/lib/common/error_private.h b/lib/common/error_private.h
index f8e68016a..a55bce847 100644
--- a/lib/common/error_private.h
+++ b/lib/common/error_private.h
@@ -48,9 +48,7 @@ typedef ZSTD_ErrorCode ERR_enum;
 /*-****************************************
 *  Error codes handling
 ******************************************/
-#ifdef ERROR
-#  undef ERROR   /* reported already defined on VS 2015 (Rich Geldreich) */
-#endif
+#undef ERROR   /* reported already defined on VS 2015 (Rich Geldreich) */
 #define ERROR(name) ZSTD_ERROR(name)
 #define ZSTD_ERROR(name) ((size_t)-PREFIX(name))
 
diff --git a/lib/common/threading.h b/lib/common/threading.h
index 0a9fcf857..bd4b654c2 100644
--- a/lib/common/threading.h
+++ b/lib/common/threading.h
@@ -37,13 +37,9 @@ extern "C" {
 #  define WIN32_LEAN_AND_MEAN
 #endif
 
-#ifdef ERROR
-#  undef ERROR   /* reported already defined on VS 2015 (Rich Geldreich) */
-#endif
+#undef ERROR   /* reported already defined on VS 2015 (Rich Geldreich) */
 #include <windows.h>
-#ifdef ERROR
-#  undef ERROR   /* reported already defined on VS 2015 (Rich Geldreich) */
-#endif
+#undef ERROR
 #define ERROR(name) ZSTD_ERROR(name)