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

diff --git a/lib/common/error_private.h b/lib/common/error_private.h
index f8e68016a687015136a7d7e26b03e640fba3ea61..a55bce8472933e6875bba07cfa3947e35864ed01 100644 (file)
--- 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 0a9fcf8575751535d33d7eea15343a3737420d67..bd4b654c2207ad4e5f92783745553d36dbd6e8dc 100644 (file)
--- 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)