* lib/defines.h: Added MIN and MAX macros.

	* libmisc/salt.c: Removed MIN and MAX macros.

diff --git a/ChangeLog b/ChangeLog
index ef5ea7e8c791b686f73a552dea84191ace29f346..66bd0cf5d0df1c3cabf7e8b17fb31aa85c59777c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-20  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * lib/defines.h: Added MIN and MAX macros.
+       * libmisc/salt.c: Removed MIN and MAX macros.
+
 2009-04-20  Sven Joachim  <svenjoac@gmx.de>
 
        * NEWS, src/lastlog.c: Fix regression causing empty reports.

diff --git a/lib/defines.h b/lib/defines.h
index 1014ea9db88856a4caf3df7de280e606631d572d..9a81e83256f419841e4f7eab52ed242d0dee316d 100644 (file)
--- a/lib/defines.h
+++ b/lib/defines.h
@@ -348,4 +348,12 @@ extern char *strerror ();
 # define unused
 #endif
 
+/* ! Arguments evaluated twice ! */
+#ifndef MIN
+#define MIN(a,b) (((a) < (b)) ? (a) : (b))
+#endif
+#ifndef MAX
+#define MAX(x,y) (((x) > (y)) ? (x) : (y))
+#endif
+
 #endif                         /* _DEFINES_H_ */

diff --git a/libmisc/salt.c b/libmisc/salt.c
index d61908f6afe3f49fddc1d7255362e68caace7f71..d73646f6bd743b24e0085a6ecea508d9be5d8ee1 100644 (file)
--- a/libmisc/salt.c
+++ b/libmisc/salt.c
@@ -94,10 +94,6 @@ static size_t SHA_salt_size (void)
        return (size_t) (8 + rand_size);
 }
 
-/* ! Arguments evaluated twice ! */
-#define MAX(x,y) ((x) > (y) ? (x) : (y))
-#define MIN(x,y) ((x) < (y) ? (x) : (y))
-
 /* Default number of rounds if not explicitly specified.  */
 #define ROUNDS_DEFAULT 5000
 /* Minimum number of rounds.  */