Merge branch 'ew/directory'

* ew/directory: (21 commits)
  update: fix multiple deletes from *vec iterators
  directory: children leave parents before being free()ed
  directory: always maintain sorted properties vectors
  update: simplify the serialized_delete usage a bit
  update: remove delete_each_song and clear_directory
  directory: directory_free kills all that it contains
  update: serialize directory deletions
  update: serialize song_free in main thread
  dirvec: introduce locking for all iterators
  dirvec: use dirvec_for_each where it makes sense
  dirvec: add dirvec_for_each iterator
  songvec: avoid holding nr_lock during free(3)
  update: allow music_root updates to be queued
  update: validate in command.c and fix small memory leak
  directory: rename isRootDirectory => path_is_music_root
  Avoid calling isRootDirectory when we have a directory object
  directory: make music_root global and avoid runtime initialization
  directory: use mpd_sizeof_str_flex_array for path, too
  tag_item: avoid wasting space when struct is unpackable
  song: use mpd_sizeof_str_flex_array for song.url
  ...

[ew: fixed up merge errors with myself when isRootDirectory
 went away]

1 files changed, 5 insertions, 0 deletions

diff --git a/src/gcc.h b/src/gcc.h
index 7492e6cad..6bd85663d 100644
--- a/src/gcc.h
+++ b/src/gcc.h
@@ -32,6 +32,10 @@
 #  define mpd_must_check	__attribute__ ((warn_unused_result))
 #  define mpd_noreturn		__attribute__ ((noreturn))
 #  define mpd_packed		__attribute__ ((packed))
+
+/* str_flex_array is always >= 1 because we always 0 terminate strings */
+#  define mpd_sizeof_str_flex_array	1
+
 /* these are very useful for type checking */
 #  define mpd_printf		__attribute__ ((format(printf,1,2)))
 #  define mpd_fprintf		__attribute__ ((format(printf,2,3)))
@@ -52,6 +56,7 @@
 #  define mpd_must_check
 #  define mpd_noreturn
 #  define mpd_packed
+#  define mpd_sizeof_str_flex_array	(sizeof(size_t))
 #  define mpd_printf
 #  define mpd_fprintf
 #  define mpd_fprintf_