tag/Settings: move typedef tag_mask_t to Mask.hxx

3 files changed, 29 insertions, 2 deletions

diff --git a/Makefile.am b/Makefile.am
index dc641391b..b6b351268 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -818,6 +818,7 @@ libtag_a_SOURCES =\
 	src/tag/TagBuilder.cxx src/tag/TagBuilder.hxx \
 	src/tag/TagItem.hxx \
 	src/tag/TagHandler.cxx src/tag/TagHandler.hxx \
+	src/tag/Mask.hxx \
 	src/tag/Settings.cxx src/tag/Settings.hxx \
 	src/tag/TagConfig.cxx src/tag/TagConfig.hxx \
 	src/tag/TagNames.c \
diff --git a/src/tag/Mask.hxx b/src/tag/Mask.hxx
new file mode 100644
index 000000000..9576d56e7
--- /dev/null
+++ b/src/tag/Mask.hxx
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2003-2015 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_TAG_MASK_HXX
+#define MPD_TAG_MASK_HXX
+
+#include <stdint.h>
+
+typedef uint_least32_t tag_mask_t;
+
+#endif
diff --git a/src/tag/Settings.hxx b/src/tag/Settings.hxx
index 42d0dc684..332454b8f 100644
--- a/src/tag/Settings.hxx
+++ b/src/tag/Settings.hxx
@@ -20,13 +20,12 @@
 #ifndef MPD_TAG_SETTINGS_HXX
 #define MPD_TAG_SETTINGS_HXX
 
+#include "Mask.hxx"
 #include "TagType.h"
 #include "Compiler.h"
 
 #include <stdint.h>
 
-typedef uint_least32_t tag_mask_t;
-
 extern tag_mask_t global_tag_mask;
 
 gcc_const