diff options
| author | Max Kellermann <max@duempel.org> | 2015-06-26 07:56:34 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2015-06-26 07:56:34 +0200 |
| commit | 2a086d20c631289c034f69ce175b25851963adf6 (patch) | |
| tree | 74e5ed30b582ccb2806943b90ce7fbd2aa351646 | |
| parent | d5cfa6d4dc0849ae199fb85ddd7d31d6a0f34d33 (diff) | |
| download | mpd-2a086d20c631289c034f69ce175b25851963adf6.tar.gz mpd-2a086d20c631289c034f69ce175b25851963adf6.tar.xz mpd-2a086d20c631289c034f69ce175b25851963adf6.zip | |
fs/Glob: remove GLib implementation
I suppose there is no non-WIN32 operating system that doesn't have
fnmatch(). So let's remove the GLib implementation.
| -rw-r--r-- | src/fs/Glob.hxx | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/fs/Glob.hxx b/src/fs/Glob.hxx index e0909bd38..822cc3fb4 100644 --- a/src/fs/Glob.hxx +++ b/src/fs/Glob.hxx @@ -30,9 +30,6 @@ #define HAVE_CLASS_GLOB #include <string> #include <shlwapi.h> -#elif defined(HAVE_GLIB) -#define HAVE_CLASS_GLOB -#include <glib.h> #endif #ifdef HAVE_CLASS_GLOB @@ -45,8 +42,6 @@ class Glob { #if defined(HAVE_FNMATCH) || defined(WIN32) std::string pattern; -#else - GPatternSpec *pattern; #endif public: @@ -56,18 +51,6 @@ public: Glob(Glob &&other) :pattern(std::move(other.pattern)) {} -#else - explicit Glob(const char *_pattern) - :pattern(g_pattern_spec_new(_pattern)) {} - - Glob(Glob &&other) - :pattern(other.pattern) { - other.pattern = nullptr; - } - - ~Glob() { - g_pattern_spec_free(pattern); - } #endif gcc_pure @@ -76,8 +59,6 @@ public: return fnmatch(pattern.c_str(), name_fs, 0) == 0; #elif defined(WIN32) return PathMatchSpecA(name_fs, pattern.c_str()); -#else - return g_pattern_match_string(pattern, name_fs); #endif } }; |