From 227a7de351ff3c93957dfed8292dcfa106fbb1b8 Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Mon, 8 Dec 2014 10:40:17 +0100 Subject: [PATCH] Global define of MIN Some OS' provide it automatically, so make sure we define it conditionally in one place. --- src/suricata-common.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/suricata-common.h b/src/suricata-common.h index 9aafa7aa35..deb0e077cc 100644 --- a/src/suricata-common.h +++ b/src/suricata-common.h @@ -282,6 +282,10 @@ #define pcre_free_study pcre_free #endif +#ifndef MIN +#define MIN(x, y) (((x)<(y))?(x):(y)) +#endif + typedef enum PacketProfileDetectId_ { PROF_DETECT_MPM, PROF_DETECT_MPM_PACKET, /* PKT MPM */