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

Originally committed as revision 12521 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Diego Biurrun 17 years ago
parent 721da10aeb
commit b00675499c
  1. 2
      libavdevice/audio.c
  2. 2
      libavdevice/bktr.c
  3. 3
      libavdevice/dv1394.c
  4. 4
      libavdevice/v4l.c
  5. 4
      libavdevice/v4l2.c
  6. 3
      libavdevice/x11grab.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

@ -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>

@ -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>

@ -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>

@ -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>

@ -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>

Loading…
Cancel
Save