Merge branch 'mk/tag'

* mk/tag: (22 commits)
  tag: fix segfault on update
  utf8.h: Fix build (broken os_compat.h #include)
  tag: optimize tag_dup(), copy item references
  tag: fix the shout and oggflac plugins
  const pointers
  tag: static directory name
  tag: try not to reallocate tag.items in every add() call
  song: don't export newNullSong()
  tag: try not to duplicate the input string
  tag: pass length to fix_utf8()
  added "length" parameter to validUtf8String()
  assert value!=NULL in fix_utf8()
  tag: converted macro fixUtf8() to an inline function
  tag: added a pool for tag items
  tag: converted tag_item.value to a char array
  removed tree.c
  tag: converted MpdTag.items to a pointer list
  tag: moved code to tag_id3.c
  wavpack: tag_new() cannot fail
  tag: converted tag_add_item() to an inline function
  ...

1 files changed, 1 insertions, 3 deletions

diff --git a/src/song.h b/src/song.h
index 8e2de410a..b7dc6c90b 100644
--- a/src/song.h
+++ b/src/song.h
@@ -36,15 +36,13 @@
 typedef struct _Song {
 	char *url;
 	mpd_sint8 type;
-	MpdTag *tag;
+	struct mpd_tag *tag;
 	struct _Directory *parentDir;
 	time_t mtime;
 } Song;
 
 typedef List SongList;
 
-Song *newNullSong(void);
-
 Song *newSong(const char *url, int songType, struct _Directory *parentDir);
 
 void freeSong(Song *);