Ticket #42858: patch-src-suricata-common.h2.diff

src/suricata-common.h

@@ -327 +327 @@
 #include "util-path.h"
 #include "util-conf.h"
 
+#ifndef strlcat 
+/* 
+* On OS X (and probably some other systems aswell), strlcat/strlcpy might be 
+* implemented as a macro. If this macro is defined while we're including this 
+* header, strlcat is already declared and trying to re-declare it with the 
+* following line *will* fail, because the macro will expand to something 
+* that's not a valid function name. 
+*/ 
 size_t strlcat(char *, const char *src, size_t siz);
+#endif /* !defined(strlcat) */
+#ifndef strlcpy
 size_t strlcpy(char *dst, const char *src, size_t siz);
+#endif /* !defined(strlcpy) */
 
 extern int coverage_unittests;
 extern int g_ut_modules;