[FFmpeg-cvslog] r12568 - in trunk/libavdevice: bktr.c dv1394.c v4l.c v4l2.c

[diego]

Author: diego
Date: Mon Mar 24 11:54:01 2008
New Revision: 12568

Log:
Remove #ifdef HAVE_SYS_MMAN_H around sys/mman.h #include.
Without the #include compilation fails.


Modified:
   trunk/libavdevice/bktr.c
   trunk/libavdevice/dv1394.c
   trunk/libavdevice/v4l.c
   trunk/libavdevice/v4l2.c

Modified: trunk/libavdevice/bktr.c
==============================================================================
--- trunk/libavdevice/bktr.c	(original)
+++ trunk/libavdevice/bktr.c	Mon Mar 24 11:54:01 2008
@@ -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>
 

Modified: trunk/libavdevice/dv1394.c
==============================================================================
--- trunk/libavdevice/dv1394.c	(original)
+++ trunk/libavdevice/dv1394.c	Mon Mar 24 11:54:01 2008
@@ -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>

Modified: trunk/libavdevice/v4l.c
==============================================================================
--- trunk/libavdevice/v4l.c	(original)
+++ trunk/libavdevice/v4l.c	Mon Mar 24 11:54:01 2008
@@ -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>

Modified: trunk/libavdevice/v4l2.c
==============================================================================
--- trunk/libavdevice/v4l2.c	(original)
+++ trunk/libavdevice/v4l2.c	Mon Mar 24 11:54:01 2008
@@ -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>