From 83af14cdbfe2eb1fbc5ce8ea395244dbe65dd4f3 Mon Sep 17 00:00:00 2001
From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Wed, 9 Dec 2009 07:20:16 +0100
Subject: [PATCH 2/2] Fix 2.64 AC_TYPE_INT*_T macro body text regression.
* lib/autoconf/types.m4 (_AC_TYPE_INT_BODY): Move helper enum
definition to prologue section, to avoid syntax error.
* NEWS, THANKS: Update.
Report by Pierre Ynard.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---
ChangeLog | 8 ++++++++
NEWS | 3 +++
THANKS | 1 +
lib/autoconf/types.m4 | 12 ++++++------
4 files changed, 18 insertions(+), 6 deletions(-)
diff --git ChangeLog ChangeLog
index 521ef79..b254d5e 100644
|
|
|
| 1 | 2009-12-09 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> |
| 2 | |
| 3 | Fix 2.65 AC_TYPE_INT*_T macro body text regression. |
| 4 | * lib/autoconf/types.m4 (_AC_TYPE_INT_BODY): Move helper enum |
| 5 | definition to prologue section, to avoid syntax error. |
| 6 | * NEWS, THANKS: Update. |
| 7 | Report by Pierre Ynard. |
| 8 | |
1 | 9 | 2009-11-24 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> |
2 | 10 | |
3 | 11 | Fix AC_FUNC_MMAP regression with C++ compiler in 2.65. |
diff --git NEWS NEWS
index d05b78c..436d22e 100644
|
|
|
1 | 1 | GNU Autoconf NEWS - User visible changes. |
2 | 2 | |
| 3 | ** The macros AC_TYPE_INT8_T, AC_TYPE_INT16_T, AC_TYPE_INT32_T, and |
| 4 | AC_TYPE_INT64_T work again. Regression introduced in 2.65. |
| 5 | |
3 | 6 | ** AC_FUNC_MMAP works in C++ mode again. Regression introduced in 2.65. |
4 | 7 | |
5 | 8 | * Major changes in Autoconf 2.65 (2009-11-21) [stable] |
diff --git THANKS THANKS
index fdd6930..5ec7633 100644
|
|
Peter Stephenson pws@csr.com |
307 | 307 | Philipp Thomas kthomas@gwdg.de |
308 | 308 | Philippe De Muyter ? |
309 | 309 | Pierre pierre42d@9online.fr |
| 310 | Pierre Ynard linkfanel@yahoo.fr |
310 | 311 | Pontus Skoeld pont@soua.net |
311 | 312 | Rainer Orth ro@TechFak.Uni-Bielefeld.DE |
312 | 313 | Raja R Harinath harinath@cs.umn.edu |
diff --git lib/autoconf/types.m4 lib/autoconf/types.m4
index 7a73fc2..3829c4c 100644
|
|
m4_define([_AC_TYPE_INT_BODY], |
635 | 635 | 'long long int' 'short int' 'signed char'; do |
636 | 636 | AC_COMPILE_IFELSE( |
637 | 637 | [AC_LANG_BOOL_COMPILE_TRY( |
638 | | [AC_INCLUDES_DEFAULT], |
639 | | [enum { N = $[]2 / 2 - 1 }; |
640 | | 0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)])], |
| 638 | [AC_INCLUDES_DEFAULT |
| 639 | enum { N = $[]2 / 2 - 1 };], |
| 640 | [0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)])], |
641 | 641 | [AC_COMPILE_IFELSE( |
642 | 642 | [AC_LANG_BOOL_COMPILE_TRY( |
643 | | [AC_INCLUDES_DEFAULT], |
644 | | [enum { N = $[]2 / 2 - 1 }; |
645 | | ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1) |
| 643 | [AC_INCLUDES_DEFAULT |
| 644 | enum { N = $[]2 / 2 - 1 };], |
| 645 | [($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1) |
646 | 646 | < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2)])], |
647 | 647 | [], |
648 | 648 | [AS_CASE([$ac_type], [int$[]2_t], |