include: move min macro from lib/net.c to include/wrc.h

Additionally use type checking Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

include: move min macro from lib/net.c to include/wrc.h
Additionally use type checking Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
8f88197c · Adam Wujek · 8f3e46d4 · 8f88197c · 8f88197c
Commit 8f88197c authored Apr 12, 2016 by Adam Wujek 💬
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

wrc.h include/wrc.h +7 -0

net.c lib/net.c +0 -2

No files found.
--- a/include/wrc.h
+++ b/include/wrc.h
@@ -21,6 +21,13 @@
 #define vprintf pp_vprintf
 #define sprintf pp_sprintf
+#ifndef min
+#define min(a, b) \
+	({ __typeof__ (a) _a = (a); \
+	  __typeof__ (b) _b = (b); \
+	  _a < _b ? _a : _b; })
+#endif
 #undef offsetof
 #define offsetof(TYPE, MEMBER) ((long) &((TYPE *)0)->MEMBER)
 #undef ARRAY_SIZE

--- a/lib/net.c
+++ b/lib/net.c
@@ -24,8 +24,6 @@
 #include "softpll_ng.h"
 #include "ipv4.h"
-#define min(x,y) ((x) < (y) ? (x) : (y))
 static struct wrpc_socket *socks[NET_MAX_SOCKETS];
 //#define net_verbose pp_printf