[SCM] libav/experimental: Remove #ifdef HAVE_SYS_MMAN_H around sys/mman.h #include. Without the #include compilation fails.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:17:39 UTC 2013


The following commit has been merged in the experimental branch:
commit 0e58bf670dd3f690d809e74b11c5db8201fbf15e
Author: Diego Biurrun <diego at biurrun.de>
Date:   Mon Mar 24 10:54:01 2008 +0000

    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

diff --git a/libavdevice/bktr.c b/libavdevice/bktr.c
index 7259f5b..0ea8dfb 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 85836f1..fdf8428 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 75ee6a3..cc31c27 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 ab5e685..565fa52 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>

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list