Fix AC_FUNC_MMAP regression with C++ compiler in 2.65.

* lib/autoconf/functions.m4 (AC_FUNC_MMAP): Use const char*
for the constant string.  Cast void* to char* for assignment.
* NEWS, THANKS: Update.
Report by Michal Čihař.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index ad025bdec4c49c6bdba7db90ab38a12977638c0a..9e908339e13ae79a8098de69281e7cbe7758d553 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-11-24  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       Fix AC_FUNC_MMAP regression with C++ compiler in 2.65.
+       * lib/autoconf/functions.m4 (AC_FUNC_MMAP): Use const char*
+       for the constant string.  Cast void* to char* for assignment.
+       * NEWS, THANKS: Update.
+       Report by Michal Čihař.
+
        Add pgfortran to list of Fortran 95+ compilers.
        * lib/autoconf/fortran.m4 (_AC_F95_FC): Add pgfortran before
        pgf95.

diff --git a/NEWS b/NEWS
index b72eb17a071684dd0f3adb7f24560d38fa3fec35..32fa9573f85efa989eaeb7049a94f9d635bdc705 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,10 @@
 GNU Autoconf NEWS - User visible changes.
 
+* Major changes in Autoconf 2.65a (????-??-??) [experimental]
+  Released by ???? ????
+
+** AC_FUNC_MMAP works in C++ mode again.  Regression introduced in 2.64.
+
 * Major changes in Autoconf 2.65 (2009-11-21) [stable]
   Released by Eric Blake, based on git versions 2.64.*.
 

diff --git a/THANKS b/THANKS
index b2881638f0c2c8f0b04cdb1ba98a2177145db905..fdd6930a25594b1fc26545f30975c033d7e0e108 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -250,6 +250,7 @@ Matthew D. Langston         langston@SLAC.Stanford.EDU
 Matthew Mueller             donut@azstarnet.com
 Matthew Woehlke             mw_triad@users.sourceforge.net
 Matthias Andree             matthias.andree@gmx.de
+Michal Čihař                nijel@debian.org
 Michael Elizabeth Chastain  chastain@cygnus.com
 Michael Jenning             ?
 Michael Matz                matz@kde.org

diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4
index 6b6e7fce970a261d28c2b1b4006767bbacfd8fd0..14a8cb9f405f0306320e77ed13c443dcf422087d 100644 (file)
--- a/lib/autoconf/functions.m4
+++ b/lib/autoconf/functions.m4
@@ -1258,6 +1258,7 @@ int
 main ()
 {
   char *data, *data2, *data3;
+  const char *cdata2;
   int i, pagesize;
   int fd, fd2;
 
@@ -1282,10 +1283,10 @@ main ()
   fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600);
   if (fd2 < 0)
     return 4;
-  data2 = "";
-  if (write (fd2, data2, 1) != 1)
+  cdata2 = "";
+  if (write (fd2, cdata2, 1) != 1)
     return 5;
-  data2 = mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
+  data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
   if (data2 == MAP_FAILED)
     return 6;
   for (i = 0; i < pagesize; ++i)