From caa7b0e03bc66f05753a3c167372076454f3ec63 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 7 Mar 2005 17:29:29 +0000 Subject: [PATCH] Don't define MAP_FILE and MAP_FAILED before has been included. --- lib/ChangeLog | 4 ++++ lib/pagealign_alloc.c | 11 +++++++++++ m4/ChangeLog | 4 ++++ m4/mmap-anon.m4 | 13 +------------ 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index a454f6f4d..0a9a5e2b5 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,7 @@ +2005-03-07 Bruno Haible + + * pagealign_alloc.c (MAP_FILE, MAP_FAILED): Define fallbacks. + 2005-03-03 Derek R. Price Bruno Haible diff --git a/lib/pagealign_alloc.c b/lib/pagealign_alloc.c index 848367064..bc9a30158 100644 --- a/lib/pagealign_alloc.c +++ b/lib/pagealign_alloc.c @@ -48,6 +48,17 @@ #define _(str) gettext (str) +#if HAVE_MMAP +/* Define MAP_FILE when it isn't otherwise. */ +# ifndef MAP_FILE +# define MAP_FILE 0 +# endif +/* Define MAP_FAILED for old systems which neglect to. */ +# ifndef MAP_FAILED +# define MAP_FAILED ((void *)-1) +# endif +#endif + #if HAVE_MMAP || ! HAVE_POSIX_MEMALIGN diff --git a/m4/ChangeLog b/m4/ChangeLog index 559d8ea3e..1adc353d0 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,7 @@ +2005-03-07 Bruno Haible + + * mmap-anon.m4 (MAP_FILE, MAP_FAILED): Remove definitions. + 2005-03-03 Bruno Haible * inttypes.m4, isc-posix.m4, once-only.m4: diff --git a/m4/mmap-anon.m4 b/m4/mmap-anon.m4 index 2abbe5589..d0fefeb68 100644 --- a/m4/mmap-anon.m4 +++ b/m4/mmap-anon.m4 @@ -1,4 +1,4 @@ -# mmap-anon.m4 serial 1 +# mmap-anon.m4 serial 2 dnl Copyright (C) 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -44,16 +44,5 @@ AC_DEFUN([gl_FUNC_MMAP_ANON], [Define to 1 if mmap()'s MAP_ANONYMOUS flag is available after including config.h and .]) fi - - AH_VERBATIM([MAP_FILE], -[/* Define MAP_FILE when it isn't otherwise. */ -#ifndef MAP_FILE -# define MAP_FILE 0 -#endif - -/* Define MAP_FAILED for old systems which neglect to. */ -#ifndef MAP_FAILED -# define MAP_FAILED ((void *)-1) -#endif]) fi ]) -- 2.11.0