From: Mikko Rasa Date: Thu, 24 Aug 2006 23:27:23 +0000 (+0000) Subject: Remove extra include of utils.h X-Git-Tag: fs-1.0~23 X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=e5f6f4e42a73330b2ec0d88f8013cecd03ec3bc0;p=libs%2Fcore.git Remove extra include of utils.h Make fnmatch return failure on win32 instead of not existing --- diff --git a/source/path.cpp b/source/path.cpp index b694214..9996137 100644 --- a/source/path.cpp +++ b/source/path.cpp @@ -4,7 +4,6 @@ Copyright © 2006 Mikko Rasa, Mikkosoft Productions Distributed under the LGPL */ #include -#include "utils.h" #include "path.h" #include "utils.h" diff --git a/source/utils.cpp b/source/utils.cpp index bae91cc..08ab958 100644 --- a/source/utils.cpp +++ b/source/utils.cpp @@ -149,12 +149,14 @@ Filename splitext(const string &fn) return result; } -#ifndef WIN32 int fnmatch(const string &pat, const Path &fn) { +#ifdef WIN32 + return -1; +#else return ::fnmatch(pat.c_str(), fn.str().c_str(), FNM_PATHNAME); -} #endif +} } // namespace Path } // namespace Msp