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 b6942149b927cf3befc95d2b9b5cb674a33d6b3f..99961379977d65684da8f3209bc65d61570039e4 100644 (file)
--- a/source/path.cpp
+++ b/source/path.cpp
@@ -4,7 +4,6 @@ Copyright © 2006  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 #include <msp/strutils.h>
-#include "utils.h"
 #include "path.h"
 #include "utils.h"
 

diff --git a/source/utils.cpp b/source/utils.cpp
index bae91cc50898ad83838749f58987a9c3a182d61a..08ab9586a31700ed9a1399b35187caba5472f37c 100644 (file)
--- 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