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

Originally committed as revision 12521 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavdevice/audio.c b/libavdevice/audio.c
index 87ffdef..6cd3313 100644 (file)
--- a/libavdevice/audio.c
+++ b/libavdevice/audio.c
@@ -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

diff --git a/libavdevice/bktr.c b/libavdevice/bktr.c
index 0ea8dfb..7259f5b 100644 (file)
--- a/libavdevice/bktr.c
+++ b/libavdevice/bktr.c
@@ -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>
 

diff --git a/libavdevice/dv1394.c b/libavdevice/dv1394.c
index 8e2e2f6..85836f1 100644 (file)
--- a/libavdevice/dv1394.c
+++ b/libavdevice/dv1394.c
@@ -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>

diff --git a/libavdevice/v4l.c b/libavdevice/v4l.c
index 5d57a2b..75ee6a3 100644 (file)
--- a/libavdevice/v4l.c
+++ b/libavdevice/v4l.c
@@ -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>

diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index 528acc4..ab5e685 100644 (file)
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -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>

diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c
index bb08dea..04e3190 100644 (file)
--- a/libavdevice/x11grab.c
+++ b/libavdevice/x11grab.c
@@ -35,11 +35,14 @@
  * and Edouard Gomez <ed.gomez@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>