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

[diego]

Author: diego
Date: Thu Mar 20 20:07:24 2008
New Revision: 12521

Log:
Only #include sys/mman.h if configure set HAVE_SYS_MMAN_H.


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

Modified: trunk/libavdevice/audio.c
==============================================================================
--- trunk/libavdevice/audio.c	(original)
+++ trunk/libavdevice/audio.c	Thu Mar 20 20:07:24 2008
@@ -31,7 +31,9 @@
 #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 AUDIO_BLOCK_SIZE 4096

Modified: trunk/libavdevice/bktr.c
==============================================================================
--- trunk/libavdevice/bktr.c	(original)
+++ trunk/libavdevice/bktr.c	Thu Mar 20 20:07:24 2008
@@ -39,7 +39,9 @@
 #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	Thu Mar 20 20:07:24 2008
@@ -19,11 +19,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config.h"
 #include <unistd.h>
 #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	Thu Mar 20 20:07:24 2008
@@ -18,12 +18,16 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "config.h"
 #include "avformat.h"
 #include "dsputil.h"
 #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	Thu Mar 20 20:07:24 2008
@@ -26,11 +26,15 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "config.h"
 #include "avformat.h"
 #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>

Modified: trunk/libavdevice/x11grab.c
==============================================================================
--- trunk/libavdevice/x11grab.c	(original)
+++ trunk/libavdevice/x11grab.c	Thu Mar 20 20:07:24 2008
@@ -35,11 +35,14 @@
  * and Edouard Gomez <ed.gomez at free.fr>.
  */
 
+#include "config.h"
 #include "avformat.h"
 #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 <time.h>