This patch consolidates a modified version of the already existing MIN
macro in lldpad to include/common.h and add a MAX macro.
Signed-off-by: Jens Osterkamp <jens@xxxxxxxxxxxxxxxxxx>
---
include/common.h | 14 ++++++++++++++
include/dcb_protocol.h | 4 ----
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/include/common.h b/include/common.h
index 01746ea..ab07dc2 100644
--- a/include/common.h
+++ b/include/common.h
@@ -387,4 +387,18 @@ typedef int socklen_t;
const char * wpa_ssid_txt(u8 *ssid, size_t ssid_len);
+#define MIN(x,y) \
+ ({ \
+ typeof (x) __x = (x); \
+ typeof (y) __y = (y); \
+ __x < __y ? __x : __y; \
+ })
+
+#define MAX(x,y) \
+ ({ \
+ typeof (x) __x = (x); \
+ typeof (y) __y = (y); \
+ __x > __y ? __x : __y; \
+ })
+
#endif /* COMMON_H */
diff --git a/include/dcb_protocol.h b/include/dcb_protocol.h
index 67f653c..c7b856f 100644
--- a/include/dcb_protocol.h
+++ b/include/dcb_protocol.h
@@ -58,10 +58,6 @@ typedef enum {
#define DUP_DCBX_TLV_LLINK 0x0020
#define TOO_MANY_NGHBRS 0x0040
-//#ifndef min /*todo: change to min()
- #define MIN(x, y) ((x) < (y) ? x : y)
-//#endif
-
#define INIT_DCB_OUI {0x00,0x1b,0x21}
bool add_adapter(char *device_name);
--
1.7.0.1
_______________________________________________
Virtualization mailing list
Virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linux-foundation.org/mailman/listinfo/virtualization
