summaryrefslogtreecommitdiff
path: root/src/input/libdvdnav
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2009-11-05 15:06:18 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2009-11-05 15:06:18 +0000
commitca2c9c30b5a0f0fcab1ffb52bd065e335ffd4afe (patch)
treee43b190684d36f5ec7c4c089aec4dc42f48714f0 /src/input/libdvdnav
parentcf86264961e27b47d57981bddb98364947ba7018 (diff)
parent2af40655557ffc8197e3e59b9428168c2454a68b (diff)
downloadxine-lib-ca2c9c30b5a0f0fcab1ffb52bd065e335ffd4afe.tar.gz
xine-lib-ca2c9c30b5a0f0fcab1ffb52bd065e335ffd4afe.tar.bz2
Merge from 1.1 (with adaptations).
--HG-- rename : src/xine-engine/scratch.h => include/xine/scratch.h rename : src/xine-utils/xmllexer.h => include/xine/xmllexer.h rename : src/xine-utils/xmlparser.h => include/xine/xmlparser.h rename : src/libspucmml/xine_cmml_decoder.c => src/spu_dec/cmml_decoder.c rename : src/libspuhdmv/xine_hdmv_decoder.c => src/spu_dec/spuhdmv_decoder.c
Diffstat (limited to 'src/input/libdvdnav')
-rw-r--r--src/input/libdvdnav/dvd_reader.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/input/libdvdnav/dvd_reader.c b/src/input/libdvdnav/dvd_reader.c
index 4144b9133..e8e035b10 100644
--- a/src/input/libdvdnav/dvd_reader.c
+++ b/src/input/libdvdnav/dvd_reader.c
@@ -30,7 +30,9 @@
#include <string.h>
#include <unistd.h>
#include <limits.h>
+#ifdef HAVE_DIRENT_H
#include <dirent.h>
+#endif
#ifndef HAVE_GETTIMEOFDAY
# ifdef WIN32