From: Sean Purcell <me@seanp.xyz>
Date: Thu, 13 Apr 2017 22:35:05 +0000 (-0700)
Subject: Change ifndef's to undef's
X-Git-Tag: v1.2.0^2~45^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42bac7fa84e5ce26c582ea517e4c51befd19cd88;p=thirdparty%2Fzstd.git

Change ifndef's to undef's
---

diff --git a/programs/bench.c b/programs/bench.c
index 8d8ed4ffa..c3681eb05 100644
--- a/programs/bench.c
+++ b/programs/bench.c
@@ -147,12 +147,10 @@ typedef struct {
 
 
 
-#ifndef MIN
-#   define MIN(a,b)    ((a) < (b) ? (a) : (b))
-#endif
-#ifndef MAX
-#   define MAX(a,b)    ((a) > (b) ? (a) : (b))
-#endif
+#undef MIN
+#undef MAX
+#define MIN(a,b)    ((a) < (b) ? (a) : (b))
+#define MAX(a,b)    ((a) > (b) ? (a) : (b))
 
 static int BMK_benchMem(const void* srcBuffer, size_t srcSize,
                         const char* displayName, int cLevel,
diff --git a/programs/dibio.c b/programs/dibio.c
index 5e685a325..aac36425c 100644
--- a/programs/dibio.c
+++ b/programs/dibio.c
@@ -89,9 +89,8 @@ unsigned DiB_isError(size_t errorCode) { return ERR_isError(errorCode); }
 
 const char* DiB_getErrorName(size_t errorCode) { return ERR_getErrorName(errorCode); }
 
-#ifndef MIN
-#   define MIN(a,b)    ((a) < (b) ? (a) : (b))
-#endif
+#undef MIN
+#define MIN(a,b)    ((a) < (b) ? (a) : (b))
 
 
 /* ********************************************************
diff --git a/programs/fileio.c b/programs/fileio.c
index 1dc222b65..9bca20664 100644
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -96,9 +96,8 @@ void FIO_setNotificationLevel(unsigned level) { g_displayLevel=level; }
 static const clock_t refreshRate = CLOCKS_PER_SEC * 15 / 100;
 static clock_t g_time = 0;
 
-#ifndef MIN
-#   define MIN(a,b)    ((a) < (b) ? (a) : (b))
-#endif
+#undef MIN
+#define MIN(a,b)    ((a) < (b) ? (a) : (b))
 
 /* ************************************************************
 * Avoid fseek()'s 2GiB barrier with MSVC, MacOS, *BSD, MinGW