summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>2009-12-09 07:20:16 +0100
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>2009-12-09 19:53:46 +0100
commit83ee5bc460a1083ab29fd9d3a3044cbaefad6ac6 (patch)
tree1638454c0d7da2d647a3fed69b73655d20cc5244
parent9900c340468dc424d567ba983ae4ebdc10c624ee (diff)
downloadautoconf-83ee5bc4.tar.gz
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>
-rw-r--r--ChangeLog8
-rw-r--r--NEWS3
-rw-r--r--THANKS1
-rw-r--r--lib/autoconf/types.m412
4 files changed, 18 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 06ff28a..5b06c77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-09 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+ Fix 2.65 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.
+
2009-12-09 Paolo Bonzini <bonzini@gnu.org>
Fix `recursion' test failure.
diff --git a/NEWS b/NEWS
index 97dcab0..d24db8a 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,9 @@ GNU Autoconf NEWS - User visible changes.
** Use of m4_divert without a named diversion now issues a syntax warning,
since it is seldom right to change diversions behind autoconf's back.
+** The macros AC_TYPE_INT8_T, AC_TYPE_INT16_T, AC_TYPE_INT32_T, and
+ AC_TYPE_INT64_T work again. Regression introduced in 2.65.
+
* 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 fdd6930..5ec7633 100644
--- a/THANKS
+++ b/THANKS
@@ -307,6 +307,7 @@ Peter Stephenson pws@csr.com
Philipp Thomas kthomas@gwdg.de
Philippe De Muyter ?
Pierre pierre42d@9online.fr
+Pierre Ynard linkfanel@yahoo.fr
Pontus Skoeld pont@soua.net
Rainer Orth ro@TechFak.Uni-Bielefeld.DE
Raja R Harinath harinath@cs.umn.edu
diff --git a/lib/autoconf/types.m4 b/lib/autoconf/types.m4
index 7a73fc2..3829c4c 100644
--- a/lib/autoconf/types.m4
+++ b/lib/autoconf/types.m4
@@ -635,14 +635,14 @@ m4_define([_AC_TYPE_INT_BODY],
'long long int' 'short int' 'signed char'; do
AC_COMPILE_IFELSE(
[AC_LANG_BOOL_COMPILE_TRY(
- [AC_INCLUDES_DEFAULT],
- [enum { N = $[]2 / 2 - 1 };
- 0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)])],
+ [AC_INCLUDES_DEFAULT
+ enum { N = $[]2 / 2 - 1 };],
+ [0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)])],
[AC_COMPILE_IFELSE(
[AC_LANG_BOOL_COMPILE_TRY(
- [AC_INCLUDES_DEFAULT],
- [enum { N = $[]2 / 2 - 1 };
- ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
+ [AC_INCLUDES_DEFAULT
+ enum { N = $[]2 / 2 - 1 };],
+ [($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
< ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2)])],
[],
[AS_CASE([$ac_type], [int$[]2_t],