5 files changed, 51 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am
index 5823b99bc..96a835af8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -363,6 +363,7 @@ src_mpd_SOURCES +=  \
 	src/UpdateArchive.cxx src/UpdateArchive.hxx
 
 libarchive_a_SOURCES = \
+	src/ArchiveDomain.cxx src/ArchiveDomain.hxx \
 	src/ArchiveLookup.cxx src/ArchiveLookup.hxx \
 	src/ArchiveList.cxx src/ArchiveList.hxx \
 	src/ArchivePlugin.cxx src/ArchivePlugin.hxx \
diff --git a/src/ArchiveDomain.cxx b/src/ArchiveDomain.cxx
new file mode 100644
index 000000000..2beeebcbb
--- /dev/null
+++ b/src/ArchiveDomain.cxx
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2003-2013 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.
+ */
+
+#include "ArchiveDomain.hxx"
+#include "util/Domain.hxx"
+
+const Domain archive_domain("archive");
diff --git a/src/ArchiveDomain.hxx b/src/ArchiveDomain.hxx
new file mode 100644
index 000000000..7bc8a223e
--- /dev/null
+++ b/src/ArchiveDomain.hxx
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2003-2013 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_ARCHIVE_DOMAIN_HXX
+#define MPD_ARCHIVE_DOMAIN_HXX
+
+extern const class Domain archive_domain;
+
+#endif
diff --git a/src/ArchiveLookup.cxx b/src/ArchiveLookup.cxx
index c781fcdaf..771c8fec6 100644
--- a/src/ArchiveLookup.cxx
+++ b/src/ArchiveLookup.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h" /* must be first for large file support */
 #include "ArchiveLookup.hxx"
-#include "util/Domain.hxx"
+#include "ArchiveDomain.hxx"
 #include "Log.hxx"
 
 #include <glib.h>
@@ -29,8 +29,6 @@
 #include <unistd.h>
 #include <errno.h>
 
-static constexpr Domain archive_domain("archive");
-
 /**
  *
  * archive_lookup is used to determine if part of pathname refers to an regular
diff --git a/src/input/ArchiveInputPlugin.cxx b/src/input/ArchiveInputPlugin.cxx
index bc97ad314..a43340994 100644
--- a/src/input/ArchiveInputPlugin.cxx
+++ b/src/input/ArchiveInputPlugin.cxx
@@ -19,20 +19,18 @@
 
 #include "config.h"
 #include "ArchiveInputPlugin.hxx"
+#include "ArchiveDomain.hxx"
 #include "ArchiveLookup.hxx"
 #include "ArchiveList.hxx"
 #include "ArchivePlugin.hxx"
 #include "ArchiveFile.hxx"
 #include "InputPlugin.hxx"
 #include "util/Error.hxx"
-#include "util/Domain.hxx"
 #include "fs/Path.hxx"
 #include "Log.hxx"
 
 #include <glib.h>
 
-static constexpr Domain archive_domain("archive");
-
 /**
  * select correct archive plugin to handle the input stream
  * may allow stacking of archive plugins. for example for handling