[Pkg-shadow-commits] r2732 - in upstream/trunk: . lib libmisc

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2009-04-21 22:06:09 +0000 (Tue, 21 Apr 2009)
New Revision: 2732

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/lib/defines.h
   upstream/trunk/libmisc/salt.c
Log:
	* lib/defines.h: Added MIN and MAX macros.
	* libmisc/salt.c: Removed MIN and MAX macros.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2009-04-21 22:03:33 UTC (rev 2731)
+++ upstream/trunk/ChangeLog	2009-04-21 22:06:09 UTC (rev 2732)
@@ -1,3 +1,8 @@
+2009-04-20  Nicolas François  <nicolas.francois at centraliens.net>
+
+	* lib/defines.h: Added MIN and MAX macros.
+	* libmisc/salt.c: Removed MIN and MAX macros.
+
 2009-04-20  Sven Joachim  <svenjoac at gmx.de>
 
 	* NEWS, src/lastlog.c: Fix regression causing empty reports.

Modified: upstream/trunk/lib/defines.h
===================================================================
--- upstream/trunk/lib/defines.h	2009-04-21 22:03:33 UTC (rev 2731)
+++ upstream/trunk/lib/defines.h	2009-04-21 22:06:09 UTC (rev 2732)
@@ -348,4 +348,12 @@
 # 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_ */

Modified: upstream/trunk/libmisc/salt.c
===================================================================
--- upstream/trunk/libmisc/salt.c	2009-04-21 22:03:33 UTC (rev 2731)
+++ upstream/trunk/libmisc/salt.c	2009-04-21 22:06:09 UTC (rev 2732)
@@ -94,10 +94,6 @@
 	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.  */