From d761d8b168bb245ab382b93142a8f9595bbb6404 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sat, 8 Feb 2014 14:24:00 +0100
Subject: [PATCH] input/nfs: move nfs_domain to lib/nfs/Domain.cxx

---
 Makefile.am                          |  1 +
 src/input/plugins/NfsInputPlugin.cxx |  4 +---
 src/lib/nfs/Domain.cxx               | 24 ++++++++++++++++++++++++
 src/lib/nfs/Domain.hxx               | 27 +++++++++++++++++++++++++++
 4 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 src/lib/nfs/Domain.cxx
 create mode 100644 src/lib/nfs/Domain.hxx

diff --git a/Makefile.am b/Makefile.am
index 8fc6f23d0..53d596247 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -961,6 +961,7 @@ endif
 
 if ENABLE_NFS
 libinput_a_SOURCES += \
+	src/lib/nfs/Domain.cxx src/lib/nfs/Domain.hxx \
 	src/input/plugins/NfsInputPlugin.cxx src/input/plugins/NfsInputPlugin.hxx
 endif
 
diff --git a/src/input/plugins/NfsInputPlugin.cxx b/src/input/plugins/NfsInputPlugin.cxx
index 0380c8c10..c16698b1c 100644
--- a/src/input/plugins/NfsInputPlugin.cxx
+++ b/src/input/plugins/NfsInputPlugin.cxx
@@ -21,9 +21,9 @@
 #include "NfsInputPlugin.hxx"
 #include "../InputStream.hxx"
 #include "../InputPlugin.hxx"
+#include "lib/nfs/Domain.hxx"
 #include "util/StringUtil.hxx"
 #include "util/Error.hxx"
-#include "util/Domain.hxx"
 
 extern "C" {
 #include <nfsc/libnfs.h>
@@ -32,8 +32,6 @@ extern "C" {
 #include <sys/stat.h>
 #include <fcntl.h>
 
-static constexpr Domain nfs_domain("nfs");
-
 class NfsInputStream {
 	InputStream base;
 
diff --git a/src/lib/nfs/Domain.cxx b/src/lib/nfs/Domain.cxx
new file mode 100644
index 000000000..fefe0dbf3
--- /dev/null
+++ b/src/lib/nfs/Domain.cxx
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2003-2014 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 "config.h"
+#include "Domain.hxx"
+#include "util/Domain.hxx"
+
+const Domain nfs_domain("nfs");
diff --git a/src/lib/nfs/Domain.hxx b/src/lib/nfs/Domain.hxx
new file mode 100644
index 000000000..6730b92e1
--- /dev/null
+++ b/src/lib/nfs/Domain.hxx
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2003-2014 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_NFS_DOMAIN_HXX
+#define MPD_NFS_DOMAIN_HXX
+
+class Domain;
+
+extern const Domain nfs_domain;
+
+#endif