summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-06-07 22:41:26 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-06-07 22:41:26 +0000
commitc93c93eb260011a401bd37be59d66f379e95efdc (patch)
treedf5aaf770ede05d2bf85a1ace0c5a655136cabda
parent94c6342759b74d9e4b272f899c72f4c5658d736d (diff)
downloadmpv-c93c93eb260011a401bd37be59d66f379e95efdc.tar.bz2
mpv-c93c93eb260011a401bd37be59d66f379e95efdc.tar.xz
cygwin & darwin fixes by Joey Parrish <joey@yunamusic.com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6335 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-xconfigure3
-rw-r--r--libmpdemux/demux_mov.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/configure b/configure
index 1b10857040..fa940dd685 100755
--- a/configure
+++ b/configure
@@ -1646,6 +1646,7 @@ echores "$_dvdio"
echocheck "sys/cdio.h"
cat > $TMPC << EOF
+#include <unistd.h>
#include <sys/cdio.h>
int main(void) { return 0; }
EOF
@@ -3725,7 +3726,7 @@ EOF
fi
if darwin ; then
# use gnu style cpp on Darwin
- CFLAGS="$CFLAGS -no-cpp-precomp"
+ CFLAGS="$CFLAGS -no-cpp-precomp -DSYS_DARWIN"
fi
# Thread support
if linux ; then
diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c
index 3c943e97b9..d7926f0416 100644
--- a/libmpdemux/demux_mov.c
+++ b/libmpdemux/demux_mov.c
@@ -42,7 +42,9 @@
#include <zlib.h>
#endif
+#if !defined(__CYGWIN__)
#include <fcntl.h>
+#endif
#define BE_16(x) (be2me_16(*(unsigned short *)(x)))
#define BE_32(x) (be2me_32(*(unsigned int *)(x)))