Added side effect free min and max macros.

diff --git a/src/libstrongswan/utils.h b/src/libstrongswan/utils.h
index 6b0990f..35008f4 100644 (file)
--- a/src/libstrongswan/utils.h
+++ b/src/libstrongswan/utils.h
@@ -72,12 +72,19 @@
 /**
  * Macro gives back larger of two values.
  */
-#define max(x,y) ((x) > (y) ? (x):(y))
+#define max(x,y) ({ \
+       typeof(x) _x = (x); \
+       typeof(y) _y = (y); \
+       _x > _y ? _x : _y; })
+
 
 /**
  * Macro gives back smaller of two values.
  */
-#define min(x,y) ((x) < (y) ? (x):(y))
+#define min(x,y) ({ \
+       typeof(x) _x = (x); \
+       typeof(y) _y = (y); \
+       _x < _y ? _x : _y; })
 
 /**
  * Call destructor of an object, if object != NULL