aboutsummaryrefslogtreecommitdiffstats
path: root/src/output/httpd_client.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-01-07 23:50:23 +0100
committerMax Kellermann <max@duempel.org>2011-01-07 23:50:23 +0100
commit8c0afd8557b1823e2df94c9f4de90c29eafbf035 (patch)
treeec4d9131c4e1cb5e1a832e4b70712884f2406a81 /src/output/httpd_client.c
parent2a56300f7bad00860f5ff44dfea061386173a852 (diff)
parent0022fb100b7d22b9612474ebee944e66c2a7b33b (diff)
downloadmpd-8c0afd8557b1823e2df94c9f4de90c29eafbf035.tar.gz
mpd-8c0afd8557b1823e2df94c9f4de90c29eafbf035.tar.xz
mpd-8c0afd8557b1823e2df94c9f4de90c29eafbf035.zip
Merge branch 'v0.15.x' into v0.16.x
Conflicts: NEWS configure.ac src/directory.h
Diffstat (limited to 'src/output/httpd_client.c')
-rw-r--r--src/output/httpd_client.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/output/httpd_client.c b/src/output/httpd_client.c
index 6bd095838..f5e14925b 100644
--- a/src/output/httpd_client.c
+++ b/src/output/httpd_client.c
@@ -29,6 +29,9 @@
#include <assert.h>
#include <string.h>
+#undef G_LOG_DOMAIN
+#define G_LOG_DOMAIN "httpd_output"
+
struct httpd_client {
/**
* The httpd output object this client is connected to.