From 48cc4a6cedd7147791262474350b84b2b9e7b42f Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Wed, 19 May 2021 17:36:01 +0200
Subject: [PATCH] fs/Glob: remove redundant #ifdefs

---
 src/fs/Glob.hxx | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/fs/Glob.hxx b/src/fs/Glob.hxx
index 0a2e9abfc..c7d11c329 100644
--- a/src/fs/Glob.hxx
+++ b/src/fs/Glob.hxx
@@ -24,34 +24,30 @@
 
 #ifdef HAVE_FNMATCH
 #define HAVE_CLASS_GLOB
-#include <string>
 #include <fnmatch.h>
 #elif defined(_WIN32)
 #define HAVE_CLASS_GLOB
-#include <string>
 #include <shlwapi.h>
 #endif
 
 #ifdef HAVE_CLASS_GLOB
 #include "util/Compiler.h"
 
+#include <string>
+
 /**
  * A pattern that matches file names.  It may contain shell wildcards
  * (asterisk and question mark).
  */
 class Glob {
-#if defined(HAVE_FNMATCH) || defined(_WIN32)
 	std::string pattern;
-#endif
 
 public:
-#if defined(HAVE_FNMATCH) || defined(_WIN32)
 	explicit Glob(const char *_pattern)
 		:pattern(_pattern) {}
 
 	Glob(Glob &&other)
 		:pattern(std::move(other.pattern)) {}
-#endif
 
 	gcc_pure
 	bool Check(const char *name_fs) const noexcept {