X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fmmap-anon.m4;h=13fbd3c491b51031ef5cae4c1ee6948b50bd932e;hb=8eaac7a51d093dbcecc0c2b42a5762a882b4517b;hp=2abbe5589887252dc53fc038e753ee681a4305b2;hpb=5a8e6f05f64341950627147bd9ecb68e1b90b77c;p=gnulib.git

diff --git a/m4/mmap-anon.m4 b/m4/mmap-anon.m4
index 2abbe5589..13fbd3c49 100644
--- a/m4/mmap-anon.m4
+++ b/m4/mmap-anon.m4
@@ -1,5 +1,5 @@
-# mmap-anon.m4 serial 1
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+# mmap-anon.m4 serial 4
+dnl Copyright (C) 2005, 2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -11,7 +11,7 @@ AC_DEFUN([gl_FUNC_MMAP_ANON],
   AC_REQUIRE([AC_PROG_EGREP])
 
   dnl Persuade glibc <sys/mman.h> to define MAP_ANONYMOUS.
-  AC_REQUIRE([AC_GNU_SOURCE])
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
   # Check for mmap()
   AC_FUNC_MMAP
@@ -27,8 +27,8 @@ AC_DEFUN([gl_FUNC_MMAP_ANON],
 #endif
 ],
       [gl_have_mmap_anonymous=yes])
-    if test $gl_have_mmap_anonymous = no; then
-      AC_EGREP_HEADER([MAP_ANON], [
+    if test $gl_have_mmap_anonymous != yes; then
+      AC_EGREP_CPP([I cant identify this map.], [
 #include <sys/mman.h>
 #ifdef MAP_ANON
     I cant identify this map.
@@ -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 <sys/mman.h>.])
     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
 ])