aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-10-02 12:20:36 +0200
committerMax Kellermann <max@duempel.org>2013-10-02 12:20:36 +0200
commit86316b182865caf7fd76bee1b6d50c66e11a3ce2 (patch)
treef2d5501bc4c27d9a40ac1290460ccc64bfc2cf72 /src
parentefc3a69dbf17affd067d25d0f89bf09aacb3aa8e (diff)
downloadmpd-86316b182865caf7fd76bee1b6d50c66e11a3ce2.tar.gz
mpd-86316b182865caf7fd76bee1b6d50c66e11a3ce2.tar.xz
mpd-86316b182865caf7fd76bee1b6d50c66e11a3ce2.zip
output/httpd: don't include glib.h in header
Diffstat (limited to 'src')
-rw-r--r--src/output/HttpdClient.cxx2
-rw-r--r--src/output/HttpdInternal.hxx4
-rw-r--r--src/output/HttpdOutputPlugin.cxx4
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");