From 255ee646c222c446f6cbf15737aeccf88d48517e Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Tue, 8 Jan 2013 16:38:00 +0100
Subject: song: don't use GLib

---
 src/PlaylistSong.cxx |  2 ++
 src/Queue.cxx        |  2 ++
 src/cue/cue_parser.c |  2 ++
 src/song.h           | 10 ++++++----
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/PlaylistSong.cxx b/src/PlaylistSong.cxx
index cfd01b130..118fb5715 100644
--- a/src/PlaylistSong.cxx
+++ b/src/PlaylistSong.cxx
@@ -31,6 +31,8 @@ extern "C" {
 #include "path.h"
 }
 
+#include <glib.h>
+
 #include <assert.h>
 #include <string.h>
 
diff --git a/src/Queue.cxx b/src/Queue.cxx
index 97dfb5b44..345d13fb7 100644
--- a/src/Queue.cxx
+++ b/src/Queue.cxx
@@ -21,6 +21,8 @@
 #include "Queue.hxx"
 #include "song.h"
 
+#include <glib.h>
+
 #include <stdlib.h>
 
 queue::queue(unsigned _max_length)
diff --git a/src/cue/cue_parser.c b/src/cue/cue_parser.c
index 9ccc3bcdd..bee757c9c 100644
--- a/src/cue/cue_parser.c
+++ b/src/cue/cue_parser.c
@@ -23,6 +23,8 @@
 #include "song.h"
 #include "tag.h"
 
+#include <glib.h>
+
 #include <assert.h>
 #include <stdlib.h>
 
diff --git a/src/song.h b/src/song.h
index 6ac036953..db582beea 100644
--- a/src/song.h
+++ b/src/song.h
@@ -23,8 +23,6 @@
 #include "util/list.h"
 #include "gcc.h"
 
-#include <glib.h>
-
 #include <assert.h>
 #include <stddef.h>
 #include <stdbool.h>
@@ -68,7 +66,9 @@ struct song {
  */
 extern struct Directory detached_root;
 
-G_BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /** allocate a new song with a remote URL */
 struct song *
@@ -160,6 +160,8 @@ song_get_uri(const struct song *song);
 double
 song_get_duration(const struct song *song);
 
-G_END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif
-- 
cgit v1.2.3