aboutsummaryrefslogtreecommitdiffstats
path: root/src/directory.h
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-01-07 23:50:23 +0100
committerMax Kellermann <max@duempel.org>2011-01-07 23:50:23 +0100
commit8c0afd8557b1823e2df94c9f4de90c29eafbf035 (patch)
treeec4d9131c4e1cb5e1a832e4b70712884f2406a81 /src/directory.h
parent2a56300f7bad00860f5ff44dfea061386173a852 (diff)
parent0022fb100b7d22b9612474ebee944e66c2a7b33b (diff)
downloadmpd-8c0afd8557b1823e2df94c9f4de90c29eafbf035.tar.gz
mpd-8c0afd8557b1823e2df94c9f4de90c29eafbf035.tar.xz
mpd-8c0afd8557b1823e2df94c9f4de90c29eafbf035.zip
Merge branch 'v0.15.x' into v0.16.x
Conflicts: NEWS configure.ac src/directory.h
Diffstat (limited to '')
-rw-r--r--src/directory.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/directory.h b/src/directory.h
index dde741a71..69e2b3638 100644
--- a/src/directory.h
+++ b/src/directory.h
@@ -30,8 +30,8 @@
#define DIRECTORY_DIR "directory: "
-#define DEVICE_INARCHIVE (dev_t)(-1)
-#define DEVICE_CONTAINER (dev_t)(-2)
+#define DEVICE_INARCHIVE (dev_t)(-1)
+#define DEVICE_CONTAINER (dev_t)(-2)
struct directory {
struct dirvec children;