From: Eric Leblond <eric@regit.org>
Date: Fri, 7 Sep 2012 11:31:03 +0000 (+0200)
Subject: freebsd: fix warning about redeclaration.
X-Git-Tag: suricata-1.4beta2~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7af9fd7735c2004866272ffe3a0d91ca5c96e080;p=thirdparty%2Fsuricata.git

freebsd: fix warning about redeclaration.
---

diff --git a/src/util-crypt.h b/src/util-crypt.h
index c6af16f855..7a3540b29f 100644
--- a/src/util-crypt.h
+++ b/src/util-crypt.h
@@ -60,7 +60,9 @@ typedef enum {
 
 #define ROL(x, y) ( (((unsigned long)(x)<<(unsigned long)((y)&31)) | (((unsigned long)(x)&0xFFFFFFFFUL)>>(unsigned long)(32-((y)&31)))) & 0xFFFFFFFFUL)
 #define ROLc(x, y) ( (((unsigned long)(x)<<(unsigned long)((y)&31)) | (((unsigned long)(x)&0xFFFFFFFFUL)>>(unsigned long)(32-((y)&31)))) & 0xFFFFFFFFUL)
+#ifndef MIN
 #define MIN(x, y) ( ((x)<(y))?(x):(y) )
+#endif
 
 typedef struct Sha1State_ {
     uint64_t length;
diff --git a/src/util-profiling.c b/src/util-profiling.c
index 524f05a4ee..23ffe41671 100644
--- a/src/util-profiling.c
+++ b/src/util-profiling.c
@@ -41,7 +41,10 @@
 
 #ifdef PROFILING
 
+#ifndef MIN
 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
+#endif
+
 #define DEFAULT_LOG_FILENAME "profile.log"
 #define DEFAULT_LOG_MODE_APPEND "yes"