Merge branch 'rs/win32-syslog-leakfix' into next

diff --git a/wildmatch.c b/wildmatch.c
index 57c876580592ab246d0c5c20cf20079d2097243c..d074c1be1046f1aba11d21eb5b66a738590bc712 100644 (file)
--- a/wildmatch.c
+++ b/wildmatch.c
@@ -272,8 +272,7 @@ static int dowild(const uchar *p, const uchar *text, unsigned int flags)
 }
 
 /* Match the "pattern" against the "text" string. */
-int wildmatch(const char *pattern, const char *text,
-             unsigned int flags, struct wildopts *wo)
+int wildmatch(const char *pattern, const char *text, unsigned int flags)
 {
        return dowild((const uchar*)pattern, (const uchar*)text, flags);
 }