aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2008-03-24 10:54:01 +0000
committerDiego Biurrun <diego@biurrun.de>2008-03-24 10:54:01 +0000
commit0e58bf670dd3f690d809e74b11c5db8201fbf15e (patch)
tree6c46f6707ec3469911619a1982f86ea730547705
parent362b3bf757ba2f836a9ab6c0c7ff79164b3e0c10 (diff)
downloadffmpeg-0e58bf670dd3f690d809e74b11c5db8201fbf15e.tar.gz
Remove #ifdef HAVE_SYS_MMAN_H around sys/mman.h #include.
Without the #include compilation fails. Originally committed as revision 12568 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavdevice/bktr.c2
-rw-r--r--libavdevice/dv1394.c2
-rw-r--r--libavdevice/v4l.c2
-rw-r--r--libavdevice/v4l2.c2
4 files changed, 0 insertions, 8 deletions
diff --git a/libavdevice/bktr.c b/libavdevice/bktr.c
index 7259f5b623..0ea8dfb02c 100644
--- a/libavdevice/bktr.c
+++ b/libavdevice/bktr.c
@@ -39,9 +39,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <sys/ioctl.h>
-#ifdef HAVE_SYS_MMAN_H
#include <sys/mman.h>
-#endif
#include <sys/time.h>
#include <signal.h>
diff --git a/libavdevice/dv1394.c b/libavdevice/dv1394.c
index 85836f1b80..fdf8428b5e 100644
--- a/libavdevice/dv1394.c
+++ b/libavdevice/dv1394.c
@@ -24,9 +24,7 @@
#include <fcntl.h>
#include <errno.h>
#include <sys/ioctl.h>
-#ifdef HAVE_SYS_MMAN_H
#include <sys/mman.h>
-#endif
#include <sys/poll.h>
#include <sys/time.h>
#include <time.h>
diff --git a/libavdevice/v4l.c b/libavdevice/v4l.c
index 75ee6a35a1..cc31c27115 100644
--- a/libavdevice/v4l.c
+++ b/libavdevice/v4l.c
@@ -25,9 +25,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <sys/ioctl.h>
-#ifdef HAVE_SYS_MMAN_H
#include <sys/mman.h>
-#endif
#include <sys/time.h>
#define _LINUX_TIME_H 1
#include <linux/videodev.h>
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index ab5e6857cb..565fa5253f 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -32,9 +32,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <sys/ioctl.h>
-#ifdef HAVE_SYS_MMAN_H
#include <sys/mman.h>
-#endif
#include <sys/time.h>
#include <asm/types.h>
#include <linux/videodev2.h>