Makefile.am: disable dist-bzip2

[ncmpc.git] / src / mpdclient.h

diff --git a/src/mpdclient.h b/src/mpdclient.h
index bca739b78ea025dee105c0539369875c690577d1..01294dbb48a1b8b3887a4e95a48f3506b46deaf0 100644 (file)
--- a/src/mpdclient.h
+++ b/src/mpdclient.h
@@ -2,7 +2,7 @@
 #define MPDCLIENT_H
 
 #include "playlist.h"
-#include "mpdclient.h"
+#include "Compiler.h"
 
 #include <mpd/client.h>
 
@@ -85,14 +85,14 @@ mpdclient_new(void);
 
 void mpdclient_free(struct mpdclient *c);
 
-G_GNUC_PURE
+gcc_pure
 static inline bool
 mpdclient_is_connected(const struct mpdclient *c)
 {
        return c->connection != NULL;
 }
 
-G_GNUC_PURE
+gcc_pure
 static inline bool
 mpdclient_is_playing(const struct mpdclient *c)
 {
@@ -101,7 +101,7 @@ mpdclient_is_playing(const struct mpdclient *c)
                 mpd_status_get_state(c->status) == MPD_STATE_PAUSE);
 }
 
-G_GNUC_PURE
+gcc_pure
 static inline const struct mpd_song *
 mpdclient_get_current_song(const struct mpdclient *c)
 {
@@ -197,7 +197,10 @@ mpdclient_playlist_update_changes(struct mpdclient *c);
 bool
 mpdclient_filelist_add_all(struct mpdclient *c, struct filelist *fl);
 
-/* sort by list-format */
-gint compare_filelistentry_format(gconstpointer filelist_entry1, gconstpointer filelist_entry2);
+/* sort by song format */
+gcc_pure
+gint compare_filelistentry_format(gconstpointer filelist_entry1,
+                                 gconstpointer filelist_entry2,
+                                 const char *song_format);
 
 #endif