From: Rudolf Polzer Date: Fri, 1 Jul 2011 09:41:02 +0000 (+0200) Subject: fix more compile errors X-Git-Tag: xonotic-v0.5.0~3 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=114175def3d11371b40c8ec8f4a4e6d2ea1f6927;p=xonotic%2Fnetradiant.git fix more compile errors --- diff --git a/include/filematch.h b/include/filematch.h deleted file mode 100644 index f8018096..00000000 --- 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 f3e3ea44..7989cbb2 100644 --- a/libs/filematch.c +++ b/libs/filematch.c @@ -1,10 +1,11 @@ -#include "matchpattern.h" +#include +#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 index 00000000..f8018096 --- /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