aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2012-08-08 20:06:20 +0200
committerMax Kellermann <max@duempel.org>2012-08-08 20:07:47 +0200
commit6a83721c558605f6c2bde0d0d23e2bfd19d8bbbe (patch)
tree1c63a0fc86b7109b0f085368f432c34fdc7bca0d
parentca9795c30a9c94fb6b9dd3391546f3332f65b4f2 (diff)
downloadmpd-6a83721c558605f6c2bde0d0d23e2bfd19d8bbbe.tar.gz
mpd-6a83721c558605f6c2bde0d0d23e2bfd19d8bbbe.tar.xz
mpd-6a83721c558605f6c2bde0d0d23e2bfd19d8bbbe.zip
directory: use gcc.h macros, not GLib
-rw-r--r--src/directory.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/directory.h b/src/directory.h
index 81eb140c2..d569fee9e 100644
--- a/src/directory.h
+++ b/src/directory.h
@@ -22,6 +22,7 @@
#include "check.h"
#include "util/list.h"
+#include "gcc.h"
#ifdef __cplusplus
#include "DatabaseVisitor.hxx"
@@ -114,14 +115,14 @@ isRootDirectory(const char *name)
/**
* Generic constructor for #directory object.
*/
-G_GNUC_MALLOC
+gcc_malloc
struct directory *
directory_new(const char *dirname, struct directory *parent);
/**
* Create a new root #directory object.
*/
-G_GNUC_MALLOC
+gcc_malloc
static inline struct directory *
directory_new_root(void)
{
@@ -170,14 +171,14 @@ directory_is_root(const struct directory *directory)
/**
* Returns the base name of the directory.
*/
-G_GNUC_PURE
+gcc_pure
const char *
directory_get_name(const struct directory *directory);
/**
* Caller must lock the #db_mutex.
*/
-G_GNUC_PURE
+gcc_pure
struct directory *
directory_get_child(const struct directory *directory, const char *name);
@@ -189,7 +190,7 @@ directory_get_child(const struct directory *directory, const char *name);
* @param parent the parent directory the new one will be added to
* @param name_utf8 the UTF-8 encoded name of the new sub directory
*/
-G_GNUC_MALLOC
+gcc_malloc
struct directory *
directory_new_child(struct directory *parent, const char *name_utf8);
@@ -244,7 +245,7 @@ directory_remove_song(struct directory *directory, struct song *song);
*
* Caller must lock the #db_mutex.
*/
-G_GNUC_PURE
+gcc_pure
struct song *
directory_get_song(const struct directory *directory, const char *name_utf8);