From 0e58bf670dd3f690d809e74b11c5db8201fbf15e Mon Sep 17 00:00:00 2001 From: Diego Biurrun <diego@biurrun.de> Date: Mon, 24 Mar 2008 10:54:01 +0000 Subject: [PATCH] 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 --- libavdevice/bktr.c | 2 -- libavdevice/dv1394.c | 2 -- libavdevice/v4l.c | 2 -- libavdevice/v4l2.c | 2 -- 4 files changed, 8 deletions(-) diff --git a/libavdevice/bktr.c b/libavdevice/bktr.c index 7259f5b6235..0ea8dfb02c4 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 85836f1b802..fdf8428b5e8 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 75ee6a35a16..cc31c27115e 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 ab5e6857cb8..565fa5253f6 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> -- GitLab