From 86316b182865caf7fd76bee1b6d50c66e11a3ce2 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Wed, 2 Oct 2013 12:20:36 +0200
Subject: output/httpd: don't include glib.h in header

---
 src/output/HttpdClient.cxx       | 2 ++
 src/output/HttpdInternal.hxx     | 4 +---
 src/output/HttpdOutputPlugin.cxx | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/output/HttpdClient.cxx b/src/output/HttpdClient.cxx
index cbf396088..f7ae8d10c 100644
--- a/src/output/HttpdClient.cxx
+++ b/src/output/HttpdClient.cxx
@@ -26,6 +26,8 @@
 #include "system/SocketError.hxx"
 #include "Log.hxx"
 
+#include <glib.h>
+
 #include <assert.h>
 #include <string.h>
 
diff --git a/src/output/HttpdInternal.hxx b/src/output/HttpdInternal.hxx
index 9437cfedf..445e2ff1a 100644
--- a/src/output/HttpdInternal.hxx
+++ b/src/output/HttpdInternal.hxx
@@ -30,8 +30,6 @@
 #include "thread/Mutex.hxx"
 #include "event/ServerSocket.hxx"
 
-#include <glib.h>
-
 #include <forward_list>
 
 struct config_param;
@@ -121,7 +119,7 @@ struct HttpdOutput final : private ServerSocket {
 	 * The maximum and current number of clients connected
 	 * at the same time.
 	 */
-	guint clients_max, clients_cnt;
+	unsigned clients_max, clients_cnt;
 
 	HttpdOutput(EventLoop &_loop);
 	~HttpdOutput();
diff --git a/src/output/HttpdOutputPlugin.cxx b/src/output/HttpdOutputPlugin.cxx
index f7c83002e..09f0f5e6b 100644
--- a/src/output/HttpdOutputPlugin.cxx
+++ b/src/output/HttpdOutputPlugin.cxx
@@ -33,6 +33,8 @@
 #include "util/Domain.hxx"
 #include "Log.hxx"
 
+#include <glib.h>
+
 #include <assert.h>
 
 #include <sys/types.h>
@@ -91,7 +93,7 @@ HttpdOutput::Configure(const config_param &param, Error &error)
 	genre = param.GetBlockValue("genre", "Set genre in config");
 	website = param.GetBlockValue("website", "Set website in config");
 
-	guint port = param.GetBlockValue("port", 8000u);
+	unsigned port = param.GetBlockValue("port", 8000u);
 
 	const char *encoder_name =
 		param.GetBlockValue("encoder", "vorbis");
-- 
cgit v1.2.3