diff options
| author | Max Kellermann <max@duempel.org> | 2008-10-09 15:24:05 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2008-10-09 15:24:05 +0200 |
| commit | 68f716a28bb92acb8d21785499b49cfc8b6091fb (patch) | |
| tree | 76a389a188f76b89ac91379d1330e98c51db82a5 | |
| parent | a0c044df11825069fc91dbc1ab9b6960886fd125 (diff) | |
| download | mpd-68f716a28bb92acb8d21785499b49cfc8b6091fb.tar.gz mpd-68f716a28bb92acb8d21785499b49cfc8b6091fb.tar.xz mpd-68f716a28bb92acb8d21785499b49cfc8b6091fb.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.c | 1 | ||||
| -rw-r--r-- | src/directory.h | 6 | ||||
| -rw-r--r-- | src/directory_print.c | 1 | ||||
| -rw-r--r-- | src/directory_save.c | 1 | ||||
| -rw-r--r-- | src/dirvec.h | 7 | ||||
| -rw-r--r-- | src/update.c | 1 |
6 files changed, 7 insertions, 10 deletions
diff --git a/src/directory.c b/src/directory.c index 7a602c9a9..3a5e5955d 100644 --- a/src/directory.c +++ b/src/directory.c @@ -18,7 +18,6 @@ #include "directory.h" #include "utils.h" -#include "dirvec.h" #include <assert.h> #include <string.h> diff --git a/src/directory.h b/src/directory.h index 534e0be14..14bda5b58 100644 --- a/src/directory.h +++ b/src/directory.h @@ -19,6 +19,7 @@ #ifndef DIRECTORY_H #define DIRECTORY_H +#include "dirvec.h" #include "songvec.h" #include <stdbool.h> @@ -33,11 +34,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/directory_print.c b/src/directory_print.c index 6c5178336..501abe200 100644 --- a/src/directory_print.c +++ b/src/directory_print.c @@ -20,7 +20,6 @@ #include "directory.h" #include "client.h" #include "song_print.h" -#include "dirvec.h" static int dirvec_print(struct client *client, const struct dirvec *dv) diff --git a/src/directory_save.c b/src/directory_save.c index 9d1846c2f..36b0c1a01 100644 --- a/src/directory_save.c +++ b/src/directory_save.c @@ -24,7 +24,6 @@ #include "path.h" #include "utils.h" #include "song_save.h" -#include "dirvec.h" /* TODO error checking */ int diff --git a/src/dirvec.h b/src/dirvec.h index 31719fcc8..07566116c 100644 --- a/src/dirvec.h +++ b/src/dirvec.h @@ -1,7 +1,12 @@ #ifndef DIRVEC_H #define DIRVEC_H -struct dirvec; +#include <stddef.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 312609939..1731f947d 100644 --- a/src/update.c +++ b/src/update.c @@ -27,7 +27,6 @@ #include "playlist.h" #include "utils.h" #include "main_notify.h" -#include "dirvec.h" #include "condition.h" #include "update.h" |