aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-10-09 15:24:05 +0200
committerEric Wong <normalperson@yhbt.net>2008-10-11 19:21:49 -0700
commit7f79b3c6fc21d687f116b3e2a2b7bad309a191c0 (patch)
tree0eb13c38c3265d3c6f4d38687db25dc5b89cbc1d
parenta24d3738e35d509aa180fffa127abac8057101cf (diff)
downloadmpd-7f79b3c6fc21d687f116b3e2a2b7bad309a191c0.tar.gz
mpd-7f79b3c6fc21d687f116b3e2a2b7bad309a191c0.tar.xz
mpd-7f79b3c6fc21d687f116b3e2a2b7bad309a191c0.zip
directory: moved dirvec struct declaration to dirvec.h
No idea why it was created in directory.h, but it should be in dirvec.h.
-rw-r--r--src/directory.h6
-rw-r--r--src/dirvec.h7
-rw-r--r--src/update.c1
3 files changed, 7 insertions, 7 deletions
diff --git a/src/directory.h b/src/directory.h
index 17c218bfb..c767366a7 100644
--- a/src/directory.h
+++ b/src/directory.h
@@ -20,6 +20,7 @@
#define DIRECTORY_H
#include "song.h"
+#include "dirvec.h"
#include "songvec.h"
#define DIRECTORY_DIR "directory: "
@@ -31,11 +32,6 @@
#define DIRECTORY_MPD_VERSION "mpd_version: "
#define DIRECTORY_FS_CHARSET "fs_charset: "
-struct dirvec {
- struct directory **base;
- size_t nr;
-};
-
struct directory {
char *path;
struct dirvec children;
diff --git a/src/dirvec.h b/src/dirvec.h
index 31719fcc8..24c960c2e 100644
--- a/src/dirvec.h
+++ b/src/dirvec.h
@@ -1,7 +1,12 @@
#ifndef DIRVEC_H
#define DIRVEC_H
-struct dirvec;
+#include "os_compat.h"
+
+struct dirvec {
+ struct directory **base;
+ size_t nr;
+};
void dirvec_sort(struct dirvec *dv);
diff --git a/src/update.c b/src/update.c
index 1cf6f3537..6e9f1572c 100644
--- a/src/update.c
+++ b/src/update.c
@@ -25,7 +25,6 @@
#include "playlist.h"
#include "utils.h"
#include "main_notify.h"
-#include "dirvec.h"
#include "condition.h"
#include "update.h"