changeset 33412:2a2e9b6551d8

configure: Convert HAVE_SYS_MMAN_H into a 0/1 definition. FFmpeg/Libav uses it as a 0/1 definition, so adapt MPlayer to do the same.
author diego
date Tue, 24 May 2011 19:51:38 +0000
parents 320890c90a8a
children 08da81bcc970
files configure libaf/af.c libvo/vo_bl.c libvo/vo_s3fb.c loader/dmo/DMO_VideoDecoder.c loader/dshow/DS_VideoDecoder.c loader/ext.c loader/ldt_keeper.c loader/module.c loader/pe_image.c loader/win32.c osdep/shmem.c
diffstat 12 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Tue May 24 19:47:07 2011 +0000
+++ b/configure	Tue May 24 19:51:38 2011 +0000
@@ -3531,7 +3531,7 @@
   def_mman_h='#define HAVE_SYS_MMAN_H 1'
 else
   def_mmap='#define HAVE_MMAP 0'
-  def_mman_h='#undef HAVE_SYS_MMAN_H'
+  def_mman_h='#define HAVE_SYS_MMAN_H 0'
   os2 && need_mmap=yes
 fi
 echores "$_mman"
--- a/libaf/af.c	Tue May 24 19:47:07 2011 +0000
+++ b/libaf/af.c	Tue May 24 19:51:38 2011 +0000
@@ -66,7 +66,7 @@
    &af_info_pan,
    &af_info_surround,
    &af_info_sub,
-#ifdef HAVE_SYS_MMAN_H
+#if HAVE_SYS_MMAN_H
    &af_info_export,
 #endif
    &af_info_volnorm,
--- a/libvo/vo_bl.c	Tue May 24 19:47:07 2011 +0000
+++ b/libvo/vo_bl.c	Tue May 24 19:51:38 2011 +0000
@@ -36,7 +36,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/time.h>
-#ifdef HAVE_SYS_MMAN_H
+#if HAVE_SYS_MMAN_H
 #include <sys/mman.h>
 #endif
 #include <sys/ioctl.h>
--- a/libvo/vo_s3fb.c	Tue May 24 19:47:07 2011 +0000
+++ b/libvo/vo_s3fb.c	Tue May 24 19:51:38 2011 +0000
@@ -36,7 +36,7 @@
 #include <sys/io.h>
 
 #include "config.h"
-#ifdef HAVE_SYS_MMAN_H
+#if HAVE_SYS_MMAN_H
 #include <sys/mman.h>
 #endif
 #include "mp_msg.h"
--- a/loader/dmo/DMO_VideoDecoder.c	Tue May 24 19:47:07 2011 +0000
+++ b/loader/dmo/DMO_VideoDecoder.c	Tue May 24 19:51:38 2011 +0000
@@ -39,7 +39,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <sys/types.h>
-#ifdef HAVE_SYS_MMAN_H
+#if HAVE_SYS_MMAN_H
 #include <sys/mman.h>
 #endif
 #include <stdio.h>
--- a/loader/dshow/DS_VideoDecoder.c	Tue May 24 19:47:07 2011 +0000
+++ b/loader/dshow/DS_VideoDecoder.c	Tue May 24 19:51:38 2011 +0000
@@ -39,7 +39,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <sys/types.h>
-#ifdef HAVE_SYS_MMAN_H
+#if HAVE_SYS_MMAN_H
 #include <sys/mman.h>
 #endif
 #include <stdio.h>
--- a/loader/ext.c	Tue May 24 19:47:07 2011 +0000
+++ b/loader/ext.c	Tue May 24 19:51:38 2011 +0000
@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#ifdef HAVE_SYS_MMAN_H
+#if HAVE_SYS_MMAN_H
 #include <sys/mman.h>
 #else
 #include "osdep/mmap.h"
--- a/loader/ldt_keeper.c	Tue May 24 19:47:07 2011 +0000
+++ b/loader/ldt_keeper.c	Tue May 24 19:51:38 2011 +0000
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <fcntl.h>
-#ifdef HAVE_SYS_MMAN_H
+#if HAVE_SYS_MMAN_H
 #include <sys/mman.h>
 #else
 #include "osdep/mmap.h"
--- a/loader/module.c	Tue May 24 19:47:07 2011 +0000
+++ b/loader/module.c	Tue May 24 19:51:38 2011 +0000
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#ifdef HAVE_SYS_MMAN_H
+#if HAVE_SYS_MMAN_H
 #include <sys/mman.h>
 #endif
 #include <inttypes.h>
--- a/loader/pe_image.c	Tue May 24 19:47:07 2011 +0000
+++ b/loader/pe_image.c	Tue May 24 19:51:38 2011 +0000
@@ -49,7 +49,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#ifdef HAVE_SYS_MMAN_H
+#if HAVE_SYS_MMAN_H
 #include <sys/mman.h>
 #else
 #include "osdep/mmap.h"
--- a/loader/win32.c	Tue May 24 19:47:07 2011 +0000
+++ b/loader/win32.c	Tue May 24 19:51:38 2011 +0000
@@ -70,7 +70,7 @@
 #include <kstat.h>
 #endif
 
-#ifdef HAVE_SYS_MMAN_H
+#if HAVE_SYS_MMAN_H
 #include <sys/mman.h>
 #else
 #include "osdep/mmap.h"
--- a/osdep/shmem.c	Tue May 24 19:47:07 2011 +0000
+++ b/osdep/shmem.c	Tue May 24 19:51:38 2011 +0000
@@ -31,7 +31,7 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/uio.h>
-#ifdef HAVE_SYS_MMAN_H
+#if HAVE_SYS_MMAN_H
 #include <sys/mman.h>
 #elif defined(__BEOS__)
 #include <mman.h>