freebsd: fix warning about redeclaration.

diff --git a/src/util-crypt.h b/src/util-crypt.h
index c6af16f855a9b011e46817eb2d80f981d527ed4b..7a3540b29fe44279ac8626ea2ff061544535ee54 100644 (file)
--- 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 524f05a4eed49c8aa28f8a1c133de2af5717f549..23ffe41671ba1b93a89449b8cff0ad45dd4d15f9 100644 (file)
--- 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"