ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nick Terrell
2017-08-29 11:54:38 -07:00
parent 02033be08c
commit 9822f97721
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/common/error_private.h
+1 -3
View File
@@ -48,9 +48,7 @@ typedef ZSTD_ErrorCode ERR_enum;
/*-**************************************** /*-****************************************
* Error codes handling * Error codes handling
******************************************/ ******************************************/
#ifdef ERROR #undef ERROR /* reported already defined on VS 2015 (Rich Geldreich) */
# undef ERROR /* reported already defined on VS 2015 (Rich Geldreich) */
#endif
#define ERROR(name) ZSTD_ERROR(name) #define ERROR(name) ZSTD_ERROR(name)
#define ZSTD_ERROR(name) ((size_t)-PREFIX(name)) #define ZSTD_ERROR(name) ((size_t)-PREFIX(name))
lib/common/threading.h
+2 -6
View File
@@ -37,13 +37,9 @@ extern "C" {
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
#endif #endif
#ifdef ERROR #undef ERROR /* reported already defined on VS 2015 (Rich Geldreich) */
# undef ERROR /* reported already defined on VS 2015 (Rich Geldreich) */
#endif
#include <windows.h> #include <windows.h>
#ifdef ERROR #undef ERROR
# undef ERROR /* reported already defined on VS 2015 (Rich Geldreich) */
#endif
#define ERROR(name) ZSTD_ERROR(name) #define ERROR(name) ZSTD_ERROR(name)