# HG changeset patch # User diego # Date 1306266698 0 # Node ID 2a2e9b6551d81a3e5913c8f6fce0d96dde238a8d # Parent 320890c90a8add59f4bc65b415bd697492124f41 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. diff -r 320890c90a8a -r 2a2e9b6551d8 configure --- 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" diff -r 320890c90a8a -r 2a2e9b6551d8 libaf/af.c --- 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, diff -r 320890c90a8a -r 2a2e9b6551d8 libvo/vo_bl.c --- 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 #include #include -#ifdef HAVE_SYS_MMAN_H +#if HAVE_SYS_MMAN_H #include #endif #include diff -r 320890c90a8a -r 2a2e9b6551d8 libvo/vo_s3fb.c --- 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 #include "config.h" -#ifdef HAVE_SYS_MMAN_H +#if HAVE_SYS_MMAN_H #include #endif #include "mp_msg.h" diff -r 320890c90a8a -r 2a2e9b6551d8 loader/dmo/DMO_VideoDecoder.c --- 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 #include #include -#ifdef HAVE_SYS_MMAN_H +#if HAVE_SYS_MMAN_H #include #endif #include diff -r 320890c90a8a -r 2a2e9b6551d8 loader/dshow/DS_VideoDecoder.c --- 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 #include #include -#ifdef HAVE_SYS_MMAN_H +#if HAVE_SYS_MMAN_H #include #endif #include diff -r 320890c90a8a -r 2a2e9b6551d8 loader/ext.c --- 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 #include #include -#ifdef HAVE_SYS_MMAN_H +#if HAVE_SYS_MMAN_H #include #else #include "osdep/mmap.h" diff -r 320890c90a8a -r 2a2e9b6551d8 loader/ldt_keeper.c --- 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 #include #include -#ifdef HAVE_SYS_MMAN_H +#if HAVE_SYS_MMAN_H #include #else #include "osdep/mmap.h" diff -r 320890c90a8a -r 2a2e9b6551d8 loader/module.c --- 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 #include #include -#ifdef HAVE_SYS_MMAN_H +#if HAVE_SYS_MMAN_H #include #endif #include diff -r 320890c90a8a -r 2a2e9b6551d8 loader/pe_image.c --- 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 #include #include -#ifdef HAVE_SYS_MMAN_H +#if HAVE_SYS_MMAN_H #include #else #include "osdep/mmap.h" diff -r 320890c90a8a -r 2a2e9b6551d8 loader/win32.c --- 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 #endif -#ifdef HAVE_SYS_MMAN_H +#if HAVE_SYS_MMAN_H #include #else #include "osdep/mmap.h" diff -r 320890c90a8a -r 2a2e9b6551d8 osdep/shmem.c --- 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 #include #include -#ifdef HAVE_SYS_MMAN_H +#if HAVE_SYS_MMAN_H #include #elif defined(__BEOS__) #include