fix more compile errors

diff --git a/include/filematch.h b/include/filematch.h
deleted file mode 100644 (file)
index f801809..0000000
--- a/include/filematch.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#if !defined(INCLUDED_FILEMATCH_H)
-#define INCLUDED_FILEMATCH_H
-
-int matchpattern(const char *in, const char *pattern, int caseinsensitive);
-int matchpattern_with_separator(const char *in, const char *pattern, int caseinsensitive, const char *separators, int wildcard_least_one);
-
-#endif

diff --git a/libs/filematch.c b/libs/filematch.c
index f3e3ea443e3eece3b9c09f4aa3532a0719f3eba0..7989cbb2f546dcc692d8ff50515ae67edb1171c8 100644 (file)
--- a/libs/filematch.c
+++ b/libs/filematch.c
@@ -1,10 +1,11 @@
-#include "matchpattern.h"
+#include <string.h>
+#include "filematch.h"
 
 // LordHavoc: some portable directory listing code I wrote for lmp2pcx, now used in darkplaces to load id1/*.pak and such...
 
 int matchpattern(const char *in, const char *pattern, int caseinsensitive)
 {
-       return matchpattern_with_separator(in, pattern, caseinsensitive, "/\\:", false);
+       return matchpattern_with_separator(in, pattern, caseinsensitive, "/\\:", 0);
 }
 
 // wildcard_least_one: if true * matches 1 or more characters

diff --git a/libs/filematch.h b/libs/filematch.h
new file mode 100644 (file)
index 0000000..f801809
--- /dev/null
+++ b/libs/filematch.h
@@ -0,0 +1,7 @@
+#if !defined(INCLUDED_FILEMATCH_H)
+#define INCLUDED_FILEMATCH_H
+
+int matchpattern(const char *in, const char *pattern, int caseinsensitive);
+int matchpattern_with_separator(const char *in, const char *pattern, int caseinsensitive, const char *separators, int wildcard_least_one);
+
+#endif