[SCM] GNU Autoconf source repository branch, master, updated. v2.65-4-g119e8f8

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=119e8f8a2dcc13ec6e8164dd07309c0b3dc1a668

The branch, master has been updated
       via  119e8f8a2dcc13ec6e8164dd07309c0b3dc1a668 (commit)
      from  5372e97391ba83dc2e1a1577fdd77ce95d6dcfd7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 119e8f8a2dcc13ec6e8164dd07309c0b3dc1a668
Author: Ralf Wildenhues <address@hidden>
Date:   Tue Nov 24 11:36:53 2009 +0100

    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 <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                 |    6 ++++++
 NEWS                      |    5 +++++
 THANKS                    |    1 +
 lib/autoconf/functions.m4 |    7 ++++---
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ad025bd..9e90833 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-11-24  Ralf Wildenhues  <address@hidden>
 
+       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 b72eb17..32fa957 100644
--- 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 b288163..fdd6930 100644
--- a/THANKS
+++ b/THANKS
@@ -250,6 +250,7 @@ Matthew D. Langston         address@hidden
 Matthew Mueller             address@hidden
 Matthew Woehlke             address@hidden
 Matthias Andree             address@hidden
+Michal Čihař                address@hidden
 Michael Elizabeth Chastain  address@hidden
 Michael Jenning             ?
 Michael Matz                address@hidden
diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4
index 6b6e7fc..14a8cb9 100644
--- 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)


hooks/post-receive
-- 
GNU Autoconf source repository