Change ifndef's to undef's

diff --git a/programs/bench.c b/programs/bench.c
index 8d8ed4ffaa55ff89fc35c97beaecbdbceccea244..c3681eb05da7f44b6a8020561a4d745d7f81b08e 100644 (file)
--- 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 5e685a325f83a01948a52de6f4b918cf4cf50eb1..aac36425cf752de16155c7766e519c1b3a7da51e 100644 (file)
--- 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 1dc222b656c9afea940347cf98b8e6b7da5bbaf6..9bca20664d33c0e49fe13d82b5f03f14c857d0a0 100644 (file)
--- 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