[MPlayer-cvslog] r33500 - in trunk: 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...

[diego]

Author: diego
Date: Tue May 24 21:51:38 2011
New Revision: 33500

Log:
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.

Modified:
   trunk/configure
   trunk/libaf/af.c
   trunk/libvo/vo_bl.c
   trunk/libvo/vo_s3fb.c
   trunk/loader/dmo/DMO_VideoDecoder.c
   trunk/loader/dshow/DS_VideoDecoder.c
   trunk/loader/ext.c
   trunk/loader/ldt_keeper.c
   trunk/loader/module.c
   trunk/loader/pe_image.c
   trunk/loader/win32.c
   trunk/osdep/shmem.c

Modified: trunk/configure
==============================================================================
--- trunk/configure	Tue May 24 21:47:07 2011	(r33499)
+++ trunk/configure	Tue May 24 21:51:38 2011	(r33500)
@@ -3531,7 +3531,7 @@ if test "$_mman" = yes ; then
   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"

Modified: trunk/libaf/af.c
==============================================================================
--- trunk/libaf/af.c	Tue May 24 21:47:07 2011	(r33499)
+++ trunk/libaf/af.c	Tue May 24 21:51:38 2011	(r33500)
@@ -66,7 +66,7 @@ static const af_info_t * const filter_li
    &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,

Modified: trunk/libvo/vo_bl.c
==============================================================================
--- trunk/libvo/vo_bl.c	Tue May 24 21:47:07 2011	(r33499)
+++ trunk/libvo/vo_bl.c	Tue May 24 21:51:38 2011	(r33500)
@@ -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>

Modified: trunk/libvo/vo_s3fb.c
==============================================================================
--- trunk/libvo/vo_s3fb.c	Tue May 24 21:47:07 2011	(r33499)
+++ trunk/libvo/vo_s3fb.c	Tue May 24 21:51:38 2011	(r33500)
@@ -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"

Modified: trunk/loader/dmo/DMO_VideoDecoder.c
==============================================================================
--- trunk/loader/dmo/DMO_VideoDecoder.c	Tue May 24 21:47:07 2011	(r33499)
+++ trunk/loader/dmo/DMO_VideoDecoder.c	Tue May 24 21:51:38 2011	(r33500)
@@ -39,7 +39,7 @@ struct DMO_VideoDecoder
 #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>

Modified: trunk/loader/dshow/DS_VideoDecoder.c
==============================================================================
--- trunk/loader/dshow/DS_VideoDecoder.c	Tue May 24 21:47:07 2011	(r33499)
+++ trunk/loader/dshow/DS_VideoDecoder.c	Tue May 24 21:51:38 2011	(r33500)
@@ -39,7 +39,7 @@ static SampleProcUserData sampleProcData
 #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>

Modified: trunk/loader/ext.c
==============================================================================
--- trunk/loader/ext.c	Tue May 24 21:47:07 2011	(r33499)
+++ trunk/loader/ext.c	Tue May 24 21:51:38 2011	(r33500)
@@ -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"

Modified: trunk/loader/ldt_keeper.c
==============================================================================
--- trunk/loader/ldt_keeper.c	Tue May 24 21:47:07 2011	(r33499)
+++ trunk/loader/ldt_keeper.c	Tue May 24 21:51:38 2011	(r33500)
@@ -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"

Modified: trunk/loader/module.c
==============================================================================
--- trunk/loader/module.c	Tue May 24 21:47:07 2011	(r33499)
+++ trunk/loader/module.c	Tue May 24 21:51:38 2011	(r33500)
@@ -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>

Modified: trunk/loader/pe_image.c
==============================================================================
--- trunk/loader/pe_image.c	Tue May 24 21:47:07 2011	(r33499)
+++ trunk/loader/pe_image.c	Tue May 24 21:51:38 2011	(r33500)
@@ -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"

Modified: trunk/loader/win32.c
==============================================================================
--- trunk/loader/win32.c	Tue May 24 21:47:07 2011	(r33499)
+++ trunk/loader/win32.c	Tue May 24 21:51:38 2011	(r33500)
@@ -70,7 +70,7 @@ for DLL to know too much about its envir
 #include <kstat.h>
 #endif
 
-#ifdef HAVE_SYS_MMAN_H
+#if HAVE_SYS_MMAN_H
 #include <sys/mman.h>
 #else
 #include "osdep/mmap.h"

Modified: trunk/osdep/shmem.c
==============================================================================
--- trunk/osdep/shmem.c	Tue May 24 21:47:07 2011	(r33499)
+++ trunk/osdep/shmem.c	Tue May 24 21:51:38 2011	(r33500)
@@ -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>