From 9822f97721e472d711f8e28c7304dac379ccdfb6 Mon Sep 17 00:00:00 2001 From: Nick Terrell Date: Tue, 29 Aug 2017 11:54:38 -0700 Subject: [PATCH] [error] Don't guard undef X with ifdef X --- lib/common/error_private.h | 4 +--- lib/common/threading.h | 8 ++------ 2 files changed, 3 insertions(+), 9 deletions(-) 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 -#ifdef ERROR -# undef ERROR /* reported already defined on VS 2015 (Rich Geldreich) */ -#endif +#undef ERROR #define ERROR(name) ZSTD_ERROR(name) -- 2.47.2