406 files changed, 1653 insertions, 685 deletions
diff --git a/BUGS b/BUGS
index 5012ea754..58be8829b 100644
--- a/BUGS
+++ b/BUGS
@@ -1,4 +1,4 @@
-Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/ChangeLog b/ChangeLog
index 4ab3f8e80..d7eaeb06a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,722 @@
 ------------------------------------------------------------------------
+r5890 | thevenyp | 2009-01-26 09:04:38 +0000 (Mon, 26 Jan 2009) | 2 lines
+Changed paths:
+   M /branches/2.4/VERSION
+   M /branches/2.4/configure.in
+   M /branches/2.4/mpfr.h
+   M /branches/2.4/mpfr.texi
+   M /branches/2.4/version.c
+
+VERSION, version.c, mpfr.h, mpfr.texi, configure.in: Updated version to 2.4.0.
+
+------------------------------------------------------------------------
+r5889 | thevenyp | 2009-01-26 08:56:11 +0000 (Mon, 26 Jan 2009) | 4 lines
+Changed paths:
+   M /branches/2.4/README.dev
+   M /branches/2.4/nightly-test
+
+README.dev: --disable-alloca is a GMP configure option.
+nightly-test: removed --disable-alloca (GMP option)
+[merge r5886:5888 from trunk]
+
+------------------------------------------------------------------------
+r5885 | thevenyp | 2009-01-21 14:30:29 +0000 (Wed, 21 Jan 2009) | 2 lines
+Changed paths:
+   M /branches/2.4/tests/tsprintf.c
+
+tests/tsprintf.c: remove tests against libc's printf with "%a" (not in ISO C90), and with "%p" (implementation defined).
+
+------------------------------------------------------------------------
+r5884 | thevenyp | 2009-01-21 14:25:33 +0000 (Wed, 21 Jan 2009) | 4 lines
+Changed paths:
+   M /branches/2.4/mpfr-impl.h
+
+mpfr-impl.h: avoid a compiler bug under Mac OS X Tiger + Xcode (&x == &x
+is false) that makes tset_d fail; this problem was introduced in r5880.
+[merged -c 5883 from trunk]
+
+------------------------------------------------------------------------
+r5882 | thevenyp | 2009-01-21 10:06:07 +0000 (Wed, 21 Jan 2009) | 10 lines
+Changed paths:
+   M /branches/2.4/mpfr-impl.h
+   M /branches/2.4/tests/tset_ld.c
+
+Fixed bug reported by Chris Saunders: if _GMP_IEEE_FLOATS is defined,
+the build of tset_ld.c fails because DOUBLE_ISNAN expects a lvalue.
+* mpfr-impl.h: documented that for such macros, the argument must
+  be a lvalue, and always make sure that it is a lvalue (so that
+  a failure doesn't depend on the environment).
+* tests/tset_ld.c: fixed the bug.
+tests/tset_ld.c: added explanation of NaN-related failures in case
+MPFR_NANISNAN is defined.
+[merged -r 5877:5880 from trunk]
+
+------------------------------------------------------------------------
+r5881 | thevenyp | 2009-01-21 10:01:26 +0000 (Wed, 21 Jan 2009) | 4 lines
+Changed paths:
+   M /branches/2.4/tests/tversion.c
+
+tests/tversion.c: be more tolerant when checking whether gmp.h version
+and libgmp version are the same (in case patch level is 0).
+[merge -c 5879 from trunk]
+
+------------------------------------------------------------------------
+r5877 | vlefevre | 2009-01-20 00:52:25 +0000 (Tue, 20 Jan 2009) | 1 line
+Changed paths:
+   M /branches/2.4/ChangeLog
+
+ChangeLog update with "LC_ALL=en_US.UTF8 TZ=UTC svn log -rHEAD:0 -v".
+------------------------------------------------------------------------
+r5876 | vlefevre | 2009-01-20 00:45:54 +0000 (Tue, 20 Jan 2009) | 1 line
+Changed paths:
+   M /branches/2.4/tests/tconst_log2.c
+   M /branches/2.4/tests/tests.c
+   M /branches/2.4/tests/texp.c
+   M /branches/2.4/tests/tget_d.c
+   M /branches/2.4/tests/tget_d_2exp.c
+   M /branches/2.4/tests/tget_ld_2exp.c
+   M /branches/2.4/tests/tget_set_d64.c
+   M /branches/2.4/tests/tgmpop.c
+   M /branches/2.4/tests/toutimpl.c
+   M /branches/2.4/tests/tpow.c
+   M /branches/2.4/tests/tset.c
+   M /branches/2.4/tests/tset_sj.c
+   M /branches/2.4/tests/tsi_op.c
+   M /branches/2.4/tests/tsin.c
+   M /branches/2.4/tests/tstrtofr.c
+
+Added missing void's. [svn merge -c5875 .../mpfr/trunk]
+------------------------------------------------------------------------
+r5872 | vlefevre | 2009-01-20 00:32:23 +0000 (Tue, 20 Jan 2009) | 1 line
+Changed paths:
+   M /branches/2.4/vasprintf.c
+
+vasprintf.c: deleted trailing spaces.
+------------------------------------------------------------------------
+r5871 | vlefevre | 2009-01-20 00:12:15 +0000 (Tue, 20 Jan 2009) | 1 line
+Changed paths:
+   M /branches/2.4/ChangeLog
+
+ChangeLog update with "LC_ALL=en_US.UTF8 TZ=UTC svn log -rHEAD:0 -v".
+------------------------------------------------------------------------
+r5870 | vlefevre | 2009-01-20 00:10:39 +0000 (Tue, 20 Jan 2009) | 4 lines
+Changed paths:
+   M /branches/2.4/INSTALL
+   M /branches/2.4/acinclude.m4
+   M /branches/2.4/mpfr-impl.h
+   M /branches/2.4/tests/tcmp_d.c
+   M /branches/2.4/tests/tcmp_ld.c
+   M /branches/2.4/tests/tset_d.c
+   M /branches/2.4/tests/tset_ld.c
+
+Added warning messages related to the NAN != NAN test, and improved the
+tests when gcc -ffast-math is used (DOUBLE_ISNAN from mpfr-impl.h and
+Isnan_ld from tests/tset_ld.c were incorrect) in order to avoid spurious
+failures and undetected ones. [svn merge -r5861:5869 .../mpfr/trunk]
+------------------------------------------------------------------------
+r5861 | thevenyp | 2009-01-19 20:01:44 +0000 (Mon, 19 Jan 2009) | 2 lines
+Changed paths:
+   M /branches/2.4/ChangeLog
+
+ChangeLog: ChangeLog update (with LC_ALL=en_US.UTF8 TZ=UTC svn log -rHEAD:0 -v).
+
+------------------------------------------------------------------------
+r5859 | thevenyp | 2009-01-19 19:58:00 +0000 (Mon, 19 Jan 2009) | 3 lines
+Changed paths:
+   M /branches/2.4/tests/tcmp_d.c
+   M /branches/2.4/tests/tcmp_ld.c
+   M /branches/2.4/tests/tests.c
+   M /branches/2.4/tests/tset_d.c
+
+tcmp_d.c tset_d.c tcmp_ld.c: Remove tests with NaN when MPFR_NANISNAN is defined.
+tests.c: Add a warning in a comment that Isnan always returns 0 on systems where MPFR_NANISNAN is defined.
+
+------------------------------------------------------------------------
+r5858 | thevenyp | 2009-01-19 18:46:39 +0000 (Mon, 19 Jan 2009) | 2 lines
+Changed paths:
+   M /branches/2.4/ChangeLog
+
+ChangeLog: ChangeLog update (with LC_ALL=en_US.UTF8 TZ=UTC svn log -rHEAD:0 -v).
+
+------------------------------------------------------------------------
+r5857 | thevenyp | 2009-01-19 18:44:32 +0000 (Mon, 19 Jan 2009) | 2 lines
+Changed paths:
+   M /branches/2.4/VERSION
+   M /branches/2.4/configure.in
+   M /branches/2.4/mpfr.h
+   M /branches/2.4/mpfr.texi
+   M /branches/2.4/version.c
+
+VERSION, version.c, mpfr.h, mpfr.texi, configure.in: Updated version to 2.4.0-rc3.
+
+------------------------------------------------------------------------
+r5856 | thevenyp | 2009-01-19 18:31:25 +0000 (Mon, 19 Jan 2009) | 17 lines
+Changed paths:
+   M /branches/2.4/README.dev
+   M /branches/2.4/acinclude.m4
+   M /branches/2.4/configure.in
+   M /branches/2.4/mpfr.texi
+   M /branches/2.4/tests/tfprintf.c
+   M /branches/2.4/tests/tprintf.c
+   M /branches/2.4/tests/tsprintf.c
+   M /branches/2.4/vasprintf.c
+
+mpfr.texi: updated references to the GMP manual.
+mpfr.texi: improved "Formatted Output" Section.
+configure.in: Add MPFR_CHECK_PRINTF_SPEC when we can link with a gmp library.
+acinclude.m4: no quad_t detection.
+acinclude.m4: Check if the system supports intmax_t.
+acinclude.m4: Check if gmp_printf supports 'j', 'L' and 't'.
+README.dev: Remove HAVE_QUAD_T from the list of symbol.
+vasprintf.c: include header needed for intmax_t in the same way as gmp.
+vasprintf.c: no longer quad_t support.
+vasprintf.c: 'j' support if the system supports intmax_t and if the symbol NPRINTF_J is not defined.
+vasprintf.c: 'L' support if the symbol NPRINTF_L is not defined.
+vasprintf.c: 't' support if the symbol NPRINTF_T is not defined.
+tests/tsprintf.c: Do not check with long double if NPRINTF_L is defined.
+tests/tfprintf.c: Do not check with quad_t, do no check optional length modifiers.
+tests/tprintf.c:  Do not check with quad_t, do no check optional length modifiers.
+[merge -r 5800:5855 from trunk]
+
+------------------------------------------------------------------------
+r5854 | thevenyp | 2009-01-19 17:49:24 +0000 (Mon, 19 Jan 2009) | 7 lines
+Changed paths:
+   M /branches/2.4/mpfr.texi
+
+mpfr.texi: don't -> do not, doesn't -> does not, won't -> will not.
+mpfr.texi: added a reference to a texinfo bug in a comment.
+mpfr.texi: added .info extension in cross-references, to avoid the bug
+reported here: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=484740
+mpfr.texi: typo in comment.
+[merge 5839 5841 5842 5843 from trunk]
+
+------------------------------------------------------------------------
+r5850 | thevenyp | 2009-01-19 16:34:42 +0000 (Mon, 19 Jan 2009) | 3 lines
+Changed paths:
+   M /branches/2.4/tests/tsprintf.c
+
+tests/tsprintf.c: check if native types are really processed by libc printf.
+[merge -c 5837 from trunk]
+
+------------------------------------------------------------------------
+r5849 | thevenyp | 2009-01-19 16:32:36 +0000 (Mon, 19 Jan 2009) | 4 lines
+Changed paths:
+   M /branches/2.4/INSTALL
+   M /branches/2.4/configure.in
+
+INSTALL: Warn that --with-gmp, --with-gmp-include/--with-gmp-lib, and --with-gmp-build options are mutually exclusive.
+configure.in: Check and fail if --with-gmp, --with-gmp-include/--with-gmp-lib, or --with-gmp-build are use simultaneously.
+[merge -c 5834 from trunk]
+
+------------------------------------------------------------------------
+r5848 | thevenyp | 2009-01-19 16:26:29 +0000 (Mon, 19 Jan 2009) | 3 lines
+Changed paths:
+   M /branches/2.4/tests/tests.c
+
+tests/tests.c: include <sys/fpu.h> only if need be.
+[merge -c 5833 from trunk]
+
+------------------------------------------------------------------------
+r5847 | thevenyp | 2009-01-19 16:21:14 +0000 (Mon, 19 Jan 2009) | 3 lines
+Changed paths:
+   M /branches/2.4/fits_intmax.c
+   M /branches/2.4/fits_uintmax.c
+   M /branches/2.4/get_sj.c
+   M /branches/2.4/get_uj.c
+   M /branches/2.4/set_sj.c
+   M /branches/2.4/set_uj.c
+   M /branches/2.4/tests/tfits.c
+   M /branches/2.4/tests/tset_sj.c
+
+get_uj.c get_sj.c tests/tset_sj.c tests/tfits.c fits_intmax.c fits_uintmax.c set_uj.c set_sj.c: Use the same #include order for intmax_t as in gmp.
+[partial merge of r5825]
+
+------------------------------------------------------------------------
+r5846 | thevenyp | 2009-01-19 16:07:41 +0000 (Mon, 19 Jan 2009) | 3 lines
+Changed paths:
+   M /branches/2.4/tests/tadd1sp.c
+   M /branches/2.4/tests/tsub1sp.c
+
+tests/tadd1sp.c, tests/tsub1sp.c: fixed function prototypes.
+[merge -c 5812 from trunk]
+
+------------------------------------------------------------------------
+r5845 | thevenyp | 2009-01-19 16:06:12 +0000 (Mon, 19 Jan 2009) | 2 lines
+Changed paths:
+   M /branches/2.4/tests/tcan_round.c
+   M /branches/2.4/tests/tcmp2.c
+   M /branches/2.4/tests/teq.c
+   M /branches/2.4/tests/tests.c
+   M /branches/2.4/tests/texp.c
+   M /branches/2.4/tests/tfprintf.c
+   M /branches/2.4/tests/tgamma.c
+   M /branches/2.4/tests/tpow.c
+   M /branches/2.4/tests/tpow_z.c
+   M /branches/2.4/tests/tset_str.c
+   M /branches/2.4/tests/tsqrt.c
+
+Fixed printf format strings. [merge 5809 5810 5811 5813 from trunk]
+
+------------------------------------------------------------------------
+r5832 | thevenyp | 2009-01-16 16:20:29 +0000 (Fri, 16 Jan 2009) | 5 lines
+Changed paths:
+   M /branches/2.4/mpfr.texi
+
+[mpfr.texi] fixed order -> kind (typo found by Luis Rivera, thanks)
+[mpfr.texi] made difference between mpfr_set_str and mpfr_strtofr clearer
+            (after remark from Luis Rivera)
+[merge -c 5829:5831 from trunk]
+
+------------------------------------------------------------------------
+r5829 | thevenyp | 2009-01-16 13:51:32 +0000 (Fri, 16 Jan 2009) | 3 lines
+Changed paths:
+   M /branches/2.4/tests/tfprintf.c
+   M /branches/2.4/tests/tprintf.c
+
+tfprintf.c tprintf.c: Test double with "%f" instead of "%e" so as to avoid failure due to exponent "e+000" on MS Windows.
+[merge -c 5828]
+
+------------------------------------------------------------------------
+r5824 | thevenyp | 2009-01-15 13:29:06 +0000 (Thu, 15 Jan 2009) | 3 lines
+Changed paths:
+   M /branches/2.4/tests/tfprintf.c
+   M /branches/2.4/tests/tprintf.c
+
+tfprintf.c tprintf.c: Fix included headers, type intmax_t may be defined in inttypes.h or in stdint.h (see autoconf manual 5.6.1 Portability of Headers) and remove tests with u_quad_t (on Solaris 10, quad_t exists but u_quad_t doesn't, bug reported by Michael Abshoff).
+[merge r5822 5823 from trunk]
+
+------------------------------------------------------------------------
+r5820 | thevenyp | 2009-01-15 09:37:19 +0000 (Thu, 15 Jan 2009) | 2 lines
+Changed paths:
+   M /branches/2.4/ChangeLog
+
+ChangeLog: ChangeLog update (with LC_ALL=en_US.UTF8 TZ=UTC svn log -rHEAD:0 -v).
+
+------------------------------------------------------------------------
+r5819 | vlefevre | 2009-01-15 02:27:11 +0000 (Thu, 15 Jan 2009) | 3 lines
+Changed paths:
+   M /branches/2.4/BUGS
+   M /branches/2.4/ChangeLog
+   M /branches/2.4/FAQ.html
+   M /branches/2.4/NEWS
+   M /branches/2.4/README
+   M /branches/2.4/TODO
+   M /branches/2.4/abort_prec_max.c
+   M /branches/2.4/acinclude.m4
+   M /branches/2.4/acos.c
+   M /branches/2.4/acosh.c
+   M /branches/2.4/add.c
+   M /branches/2.4/add1.c
+   M /branches/2.4/add1sp.c
+   M /branches/2.4/add_d.c
+   M /branches/2.4/add_ui.c
+   M /branches/2.4/agm.c
+   M /branches/2.4/asin.c
+   M /branches/2.4/asinh.c
+   M /branches/2.4/atan.c
+   M /branches/2.4/atan2.c
+   M /branches/2.4/atanh.c
+   M /branches/2.4/cache.c
+   M /branches/2.4/cbrt.c
+   M /branches/2.4/check.c
+   M /branches/2.4/clear.c
+   M /branches/2.4/clears.c
+   M /branches/2.4/cmp.c
+   M /branches/2.4/cmp2.c
+   M /branches/2.4/cmp_abs.c
+   M /branches/2.4/cmp_d.c
+   M /branches/2.4/cmp_ld.c
+   M /branches/2.4/cmp_si.c
+   M /branches/2.4/cmp_ui.c
+   M /branches/2.4/comparisons.c
+   M /branches/2.4/configure.in
+   M /branches/2.4/const_catalan.c
+   M /branches/2.4/const_euler.c
+   M /branches/2.4/const_log2.c
+   M /branches/2.4/const_pi.c
+   M /branches/2.4/constant.c
+   M /branches/2.4/copysign.c
+   M /branches/2.4/cos.c
+   M /branches/2.4/cosh.c
+   M /branches/2.4/cot.c
+   M /branches/2.4/coth.c
+   M /branches/2.4/csc.c
+   M /branches/2.4/csch.c
+   M /branches/2.4/d_div.c
+   M /branches/2.4/d_sub.c
+   M /branches/2.4/dim.c
+   M /branches/2.4/div.c
+   M /branches/2.4/div_2exp.c
+   M /branches/2.4/div_2si.c
+   M /branches/2.4/div_2ui.c
+   M /branches/2.4/div_d.c
+   M /branches/2.4/div_ui.c
+   M /branches/2.4/dump.c
+   M /branches/2.4/eint.c
+   M /branches/2.4/eq.c
+   M /branches/2.4/erf.c
+   M /branches/2.4/erfc.c
+   M /branches/2.4/exceptions.c
+   M /branches/2.4/exp.c
+   M /branches/2.4/exp10.c
+   M /branches/2.4/exp2.c
+   M /branches/2.4/exp3.c
+   M /branches/2.4/exp_2.c
+   M /branches/2.4/expm1.c
+   M /branches/2.4/extract.c
+   M /branches/2.4/factorial.c
+   M /branches/2.4/faq.xsl
+   M /branches/2.4/fits_intmax.c
+   M /branches/2.4/fits_s.h
+   M /branches/2.4/fits_sint.c
+   M /branches/2.4/fits_slong.c
+   M /branches/2.4/fits_sshort.c
+   M /branches/2.4/fits_u.h
+   M /branches/2.4/fits_uint.c
+   M /branches/2.4/fits_uintmax.c
+   M /branches/2.4/fits_ulong.c
+   M /branches/2.4/fits_ushort.c
+   M /branches/2.4/fma.c
+   M /branches/2.4/fms.c
+   M /branches/2.4/frac.c
+   M /branches/2.4/free_cache.c
+   M /branches/2.4/gamma.c
+   M /branches/2.4/gen_inverse.h
+   M /branches/2.4/get_d.c
+   M /branches/2.4/get_d64.c
+   M /branches/2.4/get_exp.c
+   M /branches/2.4/get_f.c
+   M /branches/2.4/get_ld.c
+   M /branches/2.4/get_patches.sh
+   M /branches/2.4/get_si.c
+   M /branches/2.4/get_sj.c
+   M /branches/2.4/get_str.c
+   M /branches/2.4/get_ui.c
+   M /branches/2.4/get_uj.c
+   M /branches/2.4/get_z.c
+   M /branches/2.4/get_z_exp.c
+   M /branches/2.4/gmp_op.c
+   M /branches/2.4/hypot.c
+   M /branches/2.4/init.c
+   M /branches/2.4/init2.c
+   M /branches/2.4/inits.c
+   M /branches/2.4/inits2.c
+   M /branches/2.4/inp_str.c
+   M /branches/2.4/int_ceil_log2.c
+   M /branches/2.4/isinf.c
+   M /branches/2.4/isinteger.c
+   M /branches/2.4/isnan.c
+   M /branches/2.4/isnum.c
+   M /branches/2.4/isqrt.c
+   M /branches/2.4/iszero.c
+   M /branches/2.4/jn.c
+   M /branches/2.4/jyn_asympt.c
+   M /branches/2.4/li2.c
+   M /branches/2.4/lngamma.c
+   M /branches/2.4/log.c
+   M /branches/2.4/log10.c
+   M /branches/2.4/log1p.c
+   M /branches/2.4/log2.c
+   M /branches/2.4/logging.c
+   M /branches/2.4/mbench/Makefile
+   M /branches/2.4/mbench/generate.c
+   M /branches/2.4/mbench/mfv5-arprec.cc
+   M /branches/2.4/mbench/mfv5-cln.cc
+   M /branches/2.4/mbench/mfv5-crlibm.cc
+   M /branches/2.4/mbench/mfv5-libc.cc
+   M /branches/2.4/mbench/mfv5-lidia.cc
+   M /branches/2.4/mbench/mfv5-mpf.cc
+   M /branches/2.4/mbench/mfv5-mpfr.cc
+   M /branches/2.4/mbench/mfv5-ntl.cc
+   M /branches/2.4/mbench/mfv5-pari.cc
+   M /branches/2.4/mbench/mfv5-void.cc
+   M /branches/2.4/mbench/mfv5.cc
+   M /branches/2.4/mbench/mfv5.h
+   M /branches/2.4/mbench/mpfr-gfx.c
+   M /branches/2.4/mbench/mpfr-v4.c
+   M /branches/2.4/mbench/mpfr-v6.c
+   M /branches/2.4/mbench/timp.h
+   M /branches/2.4/minmax.c
+   M /branches/2.4/modf.c
+   M /branches/2.4/mp_clz_tab.c
+   M /branches/2.4/mparam_h.in
+   M /branches/2.4/mpf2mpfr.h
+   M /branches/2.4/mpfr-gmp.c
+   M /branches/2.4/mpfr-gmp.h
+   M /branches/2.4/mpfr-impl.h
+   M /branches/2.4/mpfr-thread.h
+   M /branches/2.4/mpfr.h
+   M /branches/2.4/mpn_exp.c
+   M /branches/2.4/mul.c
+   M /branches/2.4/mul_2exp.c
+   M /branches/2.4/mul_2si.c
+   M /branches/2.4/mul_2ui.c
+   M /branches/2.4/mul_d.c
+   M /branches/2.4/mul_ui.c
+   M /branches/2.4/mulders.c
+   M /branches/2.4/neg.c
+   M /branches/2.4/next.c
+   M /branches/2.4/out_str.c
+   M /branches/2.4/pow.c
+   M /branches/2.4/pow_si.c
+   M /branches/2.4/pow_ui.c
+   M /branches/2.4/pow_z.c
+   M /branches/2.4/powerof2.c
+   M /branches/2.4/print_raw.c
+   M /branches/2.4/print_rnd_mode.c
+   M /branches/2.4/printf.c
+   M /branches/2.4/random.c
+   M /branches/2.4/random2.c
+   M /branches/2.4/rec_sqrt.c
+   M /branches/2.4/reldiff.c
+   M /branches/2.4/rem1.c
+   M /branches/2.4/rint.c
+   M /branches/2.4/root.c
+   M /branches/2.4/round_near_x.c
+   M /branches/2.4/round_p.c
+   M /branches/2.4/round_prec.c
+   M /branches/2.4/round_raw_generic.c
+   M /branches/2.4/sec.c
+   M /branches/2.4/sech.c
+   M /branches/2.4/set.c
+   M /branches/2.4/set_d.c
+   M /branches/2.4/set_d64.c
+   M /branches/2.4/set_dfl_prec.c
+   M /branches/2.4/set_exp.c
+   M /branches/2.4/set_f.c
+   M /branches/2.4/set_inf.c
+   M /branches/2.4/set_ld.c
+   M /branches/2.4/set_nan.c
+   M /branches/2.4/set_prc_raw.c
+   M /branches/2.4/set_prec.c
+   M /branches/2.4/set_q.c
+   M /branches/2.4/set_rnd.c
+   M /branches/2.4/set_si.c
+   M /branches/2.4/set_si_2exp.c
+   M /branches/2.4/set_sj.c
+   M /branches/2.4/set_str.c
+   M /branches/2.4/set_str_raw.c
+   M /branches/2.4/set_ui.c
+   M /branches/2.4/set_ui_2exp.c
+   M /branches/2.4/set_uj.c
+   M /branches/2.4/set_z.c
+   M /branches/2.4/setmax.c
+   M /branches/2.4/setmin.c
+   M /branches/2.4/setsign.c
+   M /branches/2.4/sgn.c
+   M /branches/2.4/si_op.c
+   M /branches/2.4/signbit.c
+   M /branches/2.4/sin.c
+   M /branches/2.4/sin_cos.c
+   M /branches/2.4/sinh.c
+   M /branches/2.4/sinh_cosh.c
+   M /branches/2.4/sqr.c
+   M /branches/2.4/sqrt.c
+   M /branches/2.4/sqrt_ui.c
+   M /branches/2.4/stack_interface.c
+   M /branches/2.4/strtofr.c
+   M /branches/2.4/sub.c
+   M /branches/2.4/sub1.c
+   M /branches/2.4/sub1sp.c
+   M /branches/2.4/sub_d.c
+   M /branches/2.4/sub_ui.c
+   M /branches/2.4/subnormal.c
+   M /branches/2.4/sum.c
+   M /branches/2.4/swap.c
+   M /branches/2.4/tan.c
+   M /branches/2.4/tanh.c
+   M /branches/2.4/tests/cmp_str.c
+   M /branches/2.4/tests/data/li2
+   M /branches/2.4/tests/memory.c
+   M /branches/2.4/tests/mpf_compat.c
+   M /branches/2.4/tests/mpf_compat.h
+   M /branches/2.4/tests/mpfr-test.h
+   M /branches/2.4/tests/mpfr_compat.c
+   M /branches/2.4/tests/reuse.c
+   M /branches/2.4/tests/rnd_mode.c
+   M /branches/2.4/tests/tabs.c
+   M /branches/2.4/tests/tacos.c
+   M /branches/2.4/tests/tacosh.c
+   M /branches/2.4/tests/tadd.c
+   M /branches/2.4/tests/tadd1sp.c
+   M /branches/2.4/tests/tadd_d.c
+   M /branches/2.4/tests/tadd_ui.c
+   M /branches/2.4/tests/tagm.c
+   M /branches/2.4/tests/tasin.c
+   M /branches/2.4/tests/tasinh.c
+   M /branches/2.4/tests/tatan.c
+   M /branches/2.4/tests/tatanh.c
+   M /branches/2.4/tests/tcan_round.c
+   M /branches/2.4/tests/tcbrt.c
+   M /branches/2.4/tests/tcheck.c
+   M /branches/2.4/tests/tcmp.c
+   M /branches/2.4/tests/tcmp2.c
+   M /branches/2.4/tests/tcmp_d.c
+   M /branches/2.4/tests/tcmp_ld.c
+   M /branches/2.4/tests/tcmp_ui.c
+   M /branches/2.4/tests/tcmpabs.c
+   M /branches/2.4/tests/tcomparisons.c
+   M /branches/2.4/tests/tconst_catalan.c
+   M /branches/2.4/tests/tconst_euler.c
+   M /branches/2.4/tests/tconst_log2.c
+   M /branches/2.4/tests/tconst_pi.c
+   M /branches/2.4/tests/tcopysign.c
+   M /branches/2.4/tests/tcos.c
+   M /branches/2.4/tests/tcosh.c
+   M /branches/2.4/tests/tcot.c
+   M /branches/2.4/tests/tcoth.c
+   M /branches/2.4/tests/tcsc.c
+   M /branches/2.4/tests/tcsch.c
+   M /branches/2.4/tests/td_div.c
+   M /branches/2.4/tests/td_sub.c
+   M /branches/2.4/tests/tdim.c
+   M /branches/2.4/tests/tdiv.c
+   M /branches/2.4/tests/tdiv_d.c
+   M /branches/2.4/tests/tdiv_ui.c
+   M /branches/2.4/tests/teint.c
+   M /branches/2.4/tests/teq.c
+   M /branches/2.4/tests/terf.c
+   M /branches/2.4/tests/tests.c
+   M /branches/2.4/tests/texceptions.c
+   M /branches/2.4/tests/texp.c
+   M /branches/2.4/tests/texp10.c
+   M /branches/2.4/tests/texp2.c
+   M /branches/2.4/tests/texpm1.c
+   M /branches/2.4/tests/tfactorial.c
+   M /branches/2.4/tests/tfits.c
+   M /branches/2.4/tests/tfma.c
+   M /branches/2.4/tests/tfmod.c
+   M /branches/2.4/tests/tfms.c
+   M /branches/2.4/tests/tfprintf.c
+   M /branches/2.4/tests/tfrac.c
+   M /branches/2.4/tests/tgamma.c
+   M /branches/2.4/tests/tgeneric.c
+   M /branches/2.4/tests/tgeneric_ui.c
+   M /branches/2.4/tests/tget_d.c
+   M /branches/2.4/tests/tget_d_2exp.c
+   M /branches/2.4/tests/tget_f.c
+   M /branches/2.4/tests/tget_ld_2exp.c
+   M /branches/2.4/tests/tget_set_d64.c
+   M /branches/2.4/tests/tget_sj.c
+   M /branches/2.4/tests/tget_str.c
+   M /branches/2.4/tests/tget_z.c
+   M /branches/2.4/tests/tgmpop.c
+   M /branches/2.4/tests/thyperbolic.c
+   M /branches/2.4/tests/thypot.c
+   M /branches/2.4/tests/tinits.c
+   M /branches/2.4/tests/tinp_str.c
+   M /branches/2.4/tests/tinternals.c
+   M /branches/2.4/tests/tisnan.c
+   M /branches/2.4/tests/tisqrt.c
+   M /branches/2.4/tests/tj0.c
+   M /branches/2.4/tests/tj1.c
+   M /branches/2.4/tests/tjn.c
+   M /branches/2.4/tests/tl2b.c
+   M /branches/2.4/tests/tlgamma.c
+   M /branches/2.4/tests/tli2.c
+   M /branches/2.4/tests/tlngamma.c
+   M /branches/2.4/tests/tlog.c
+   M /branches/2.4/tests/tlog10.c
+   M /branches/2.4/tests/tlog1p.c
+   M /branches/2.4/tests/tlog2.c
+   M /branches/2.4/tests/tminmax.c
+   M /branches/2.4/tests/tmodf.c
+   M /branches/2.4/tests/tmul.c
+   M /branches/2.4/tests/tmul_2exp.c
+   M /branches/2.4/tests/tmul_d.c
+   M /branches/2.4/tests/tmul_ui.c
+   M /branches/2.4/tests/tnext.c
+   M /branches/2.4/tests/tout_str.c
+   M /branches/2.4/tests/toutimpl.c
+   M /branches/2.4/tests/tpow.c
+   M /branches/2.4/tests/tpow3.c
+   M /branches/2.4/tests/tpow_all.c
+   M /branches/2.4/tests/tpow_z.c
+   M /branches/2.4/tests/tprintf.c
+   M /branches/2.4/tests/trandom.c
+   M /branches/2.4/tests/trec_sqrt.c
+   M /branches/2.4/tests/tremquo.c
+   M /branches/2.4/tests/trint.c
+   M /branches/2.4/tests/troot.c
+   M /branches/2.4/tests/tround_prec.c
+   M /branches/2.4/tests/tsec.c
+   M /branches/2.4/tests/tsech.c
+   M /branches/2.4/tests/tset.c
+   M /branches/2.4/tests/tset_d.c
+   M /branches/2.4/tests/tset_exp.c
+   M /branches/2.4/tests/tset_f.c
+   M /branches/2.4/tests/tset_ld.c
+   M /branches/2.4/tests/tset_q.c
+   M /branches/2.4/tests/tset_si.c
+   M /branches/2.4/tests/tset_sj.c
+   M /branches/2.4/tests/tset_str.c
+   M /branches/2.4/tests/tset_z.c
+   M /branches/2.4/tests/tsgn.c
+   M /branches/2.4/tests/tsi_op.c
+   M /branches/2.4/tests/tsin.c
+   M /branches/2.4/tests/tsin_cos.c
+   M /branches/2.4/tests/tsinh.c
+   M /branches/2.4/tests/tsinh_cosh.c
+   M /branches/2.4/tests/tsprintf.c
+   M /branches/2.4/tests/tsqr.c
+   M /branches/2.4/tests/tsqrt.c
+   M /branches/2.4/tests/tsqrt_ui.c
+   M /branches/2.4/tests/tstckintc.c
+   M /branches/2.4/tests/tstrtofr.c
+   M /branches/2.4/tests/tsub.c
+   M /branches/2.4/tests/tsub1sp.c
+   M /branches/2.4/tests/tsub_d.c
+   M /branches/2.4/tests/tsub_ui.c
+   M /branches/2.4/tests/tsubnormal.c
+   M /branches/2.4/tests/tsum.c
+   M /branches/2.4/tests/tswap.c
+   M /branches/2.4/tests/ttan.c
+   M /branches/2.4/tests/ttanh.c
+   M /branches/2.4/tests/ttrunc.c
+   M /branches/2.4/tests/tui_div.c
+   M /branches/2.4/tests/tui_pow.c
+   M /branches/2.4/tests/tui_sub.c
+   M /branches/2.4/tests/tversion.c
+   M /branches/2.4/tests/ty0.c
+   M /branches/2.4/tests/ty1.c
+   M /branches/2.4/tests/tyn.c
+   M /branches/2.4/tests/tzeta.c
+   M /branches/2.4/tests/tzeta_ui.c
+   M /branches/2.4/tuneup.c
+   M /branches/2.4/uceil_exp2.c
+   M /branches/2.4/uceil_log2.c
+   M /branches/2.4/ufloor_log2.c
+   M /branches/2.4/ui_div.c
+   M /branches/2.4/ui_pow.c
+   M /branches/2.4/ui_pow_ui.c
+   M /branches/2.4/ui_sub.c
+   M /branches/2.4/urandomb.c
+   M /branches/2.4/vasprintf.c
+   M /branches/2.4/version.c
+   M /branches/2.4/volatile.c
+   M /branches/2.4/yn.c
+   M /branches/2.4/zeta.c
+   M /branches/2.4/zeta_ui.c
+
+Copyright notice update: added 2009 with
+  perl -pi -e 's/2008 Free Software/2008, 2009 Free Software/' **/*(^/)
+under zsh.
+------------------------------------------------------------------------
+r5818 | vlefevre | 2009-01-15 02:24:48 +0000 (Thu, 15 Jan 2009) | 3 lines
+Changed paths:
+   M /branches/2.4/configure.in
+
+configure.in: be more tolerant when checking whether gmp.h version
+and libgmp version are the same (in case patch level is 0).
+[merged changeset 5816 from the trunk]
+------------------------------------------------------------------------
+r5807 | thevenyp | 2009-01-13 14:04:51 +0000 (Tue, 13 Jan 2009) | 2 lines
+Changed paths:
+   M /branches/2.4/ChangeLog
+
+ChangeLog: ChangeLog update (with LC_ALL=en_US.UTF8 TZ=UTC svn log -rHEAD:0 -v).
+
+------------------------------------------------------------------------
 r5806 | thevenyp | 2009-01-13 13:40:19 +0000 (Tue, 13 Jan 2009) | 2 lines
 Changed paths:
    M /branches/2.4/NEWS
diff --git a/FAQ.html b/FAQ.html
index 9dedc8199..46129bc70 100644
--- a/FAQ.html
+++ b/FAQ.html
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
 <!--
-Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/INSTALL b/INSTALL
index 06db94854..f1b75f8ae 100644
--- a/INSTALL
+++ b/INSTALL
@@ -109,6 +109,8 @@ by Libtool's versioning system.
 --with-gmp=DIR          assumes that DIR is where you have installed GMP.
                         same as --with-gmp-lib=DIR/lib
                         and     --with-gmp-include=DIR/include
+                        (use either --with-gmp alone or one or both of
+                        --with-gmp-lib/--with-gmp-include)
                         Warning! Do not use these options if you have
                         CPPFLAGS and/or LDFLAGS containing a -I or -L
                         option with a directory that contains a GMP
@@ -124,6 +126,8 @@ by Libtool's versioning system.
                         guaranteed to work as the configure script does
                         some compiler tests earlier, and the change may
                         be too late.
+                        Warning! This option and the group of options
+                        --with-gmp are mutually exclusive.
 
 --enable-assert         build MPFR with assertions.
 
@@ -143,6 +147,8 @@ Run "./configure --help" to see the other options (autoconf default options).
 In case of problem
 ==================
 
+First, look for any warning message in the configure output.
+
 Several documents may help you to solve the problem:
   * this INSTALL file, in particular information given below;
   * the FAQ (either the FAQ.html file distributed with MPFR, or the
@@ -167,9 +173,9 @@ For instance, see the "Notes on AIX/PowerPC" section below.
 
 Warning! Do NOT use optimization options that can change the semantics
 of math operations, such as GCC's -ffast-math or Sun CC's -fast.
-Otherwise conversions from/to double's may be incorrect on infinities
-and NaN's. Since native FP arithmetic is used in a few places only,
-such options would not make MPFR faster anyway.
+Otherwise conversions from/to double's may be incorrect on infinities,
+NaN's and signed zeros. Since native FP arithmetic is used in a few
+places only, such options would not make MPFR faster anyway.
 
 On some platforms, try with "gmake" (GNU make) instead of "make".
 Problems have been reported with the Tru64 make.
diff --git a/NEWS b/NEWS
index 7b62f53b0..b3b2ecd63 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/README b/README
index 37a2f5188..e8364e274 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/README.dev b/README.dev
index 6d24f137b..0a17f2f5a 100644
--- a/README.dev
+++ b/README.dev
@@ -101,7 +101,7 @@ To make a release (for the MPFR team):
   6) Test the release version on different machines, with and without
      --enable-assert (--enable-assert, though doing more checks, may
      hide bugs due to the fact that <stdio.h> is always included) with
-     and without the --disable-alloca configure option (or compile GMP
+     and without GMP's --disable-alloca configure option (or compile GMP
      with --enable-alloca=debug and MPFR with --with-gmp-build to be
      able to get the memory leak errors), with and without -DXDEBUG in
      $CFLAGS, with and without gmp internal files, with and without
@@ -183,7 +183,6 @@ List of the used macros for building MPFR:
 
 + HAVE_ALLOCA_H:        Define if the function 'alloca' is in alloca.h.
 + HAVE_LONG_LONG:       Define if the system supports 'long long'
-+ HAVE_QUAD_T:          Define if the system supports 'quad_t'
 
 + HAVE_STDARG:          Define if the system supports 'stdarg.h'.
                          Otherwise it is assumed it is 'vararg.h'.
diff --git a/TODO b/TODO
index 9e8642d3d..2fa968ef4 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/abort_prec_max.c b/abort_prec_max.c
index 5e310f146..5983ba90e 100644
--- a/abort_prec_max.c
+++ b/abort_prec_max.c
@@ -1,6 +1,6 @@
 /* mpfr_abort_prec_max -- Abort due to maximal precision overflow.
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/acinclude.m4 b/acinclude.m4
index 896f495b4..8a2834bbf 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,6 +1,6 @@
 dnl  MPFR specific autoconf macros
 
-dnl  Copyright 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+dnl  Copyright 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 dnl  Contributed by the Arenaire and Cacao projects, INRIA.
 dnl
 dnl  This file is part of the GNU MPFR Library.
@@ -118,8 +118,8 @@ dnl check for long long
 AC_CHECK_TYPE([long long int],
    AC_DEFINE(HAVE_LONG_LONG, 1, [Define if compiler supports long long]),,)
 
-# quad_t is BSD specific
-AC_CHECK_TYPES([quad_t])
+dnl intmax_t is C99
+AC_CHECK_TYPES([intmax_t])
 
 AC_CHECK_TYPE( [union fpc_csr],
    AC_DEFINE(HAVE_FPC_CSR,1,[Define if union fpc_csr is available]), ,
@@ -221,6 +221,16 @@ int main() {
 ])
 if test "$mpfr_cv_nanisnan" = "yes"; then
   AC_DEFINE(MPFR_NANISNAN,1,[Define if NAN == NAN.])
+  AC_MSG_WARN([The test NAN != NAN is false. The probable reason is that])
+  AC_MSG_WARN([your compiler optimizes floating-point expressions in an])
+  AC_MSG_WARN([unsafe way because some option, such as -ffast-math or])
+  AC_MSG_WARN([-fast (depending on the compiler), has been used.  You])
+  AC_MSG_WARN([should NOT use such an option, otherwise MPFR functions])
+  AC_MSG_WARN([such as mpfr_get_d and mpfr_set_d may return incorrect])
+  AC_MSG_WARN([results on special FP numbers (e.g. NaN or signed zeros).])
+  AC_MSG_WARN([If you did not use such an option, please send us a bug])
+  AC_MSG_WARN([report so that we can try to find a workaround for your])
+  AC_MSG_WARN([platform and/or document the behavior.])
 fi
 
 dnl Check if the chars '0' to '9' are consecutive values
@@ -664,3 +674,66 @@ if test $gmp_cv_c_attribute_mode = yes; then
  [Define to 1 if the compiler accepts gcc style __attribute__ ((mode (XX)))])
 fi
 ])
+
+
+dnl  MPFR_FUNC_PRINTF_SPEC
+dnl  ------------------------------------
+dnl  MPFR_FUNC_PRINTF_SPEC(spec, type, [includes], [lib-prefix], [if-true], [if-false])
+dnl  Check if printf supports the conversion specification 'spec'
+dnl  with type 'type'.
+dnl  Expand 'if-true' if printf supports 'spec', 'if-false' otherwise.
+
+AC_DEFUN([MPFR_FUNC_PRINTF_SPEC],[
+AC_MSG_CHECKING(if $4printf supports "$1")
+AC_RUN_IFELSE([AC_LANG_PROGRAM([[
+#include <stdio.h>
+$3
+]], [[
+  char s[256];
+  $2 a = 0;
+  return ($4sprintf (s, "$1", a) != 1) ? 1 : 0;
+]])],
+  [AC_MSG_RESULT(yes)
+  $5],
+  [AC_MSG_RESULT(no)
+  $6])
+])
+
+
+dnl MPFR_CHECK_PRINTF_SPEC
+dnl ----------------------
+dnl Check if libc printf and gmp_printf support some optional length
+dnl modifiers.
+dnl Defined symbols are negative to shorten the gcc command line.
+
+AC_DEFUN([MPFR_CHECK_PRINTF_SPEC], [
+AC_REQUIRE([MPFR_CONFIGS])dnl
+if test "$ac_cv_type_intmax_t" == yes; then
+ MPFR_FUNC_PRINTF_SPEC([%jd], [intmax_t], [
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+
+#include <gmp.h>
+         ], [gmp_],,
+         [AC_DEFINE([NPRINTF_J], 1, [gmp_printf cannot read intmax_t])])
+fi
+
+MPFR_FUNC_PRINTF_SPEC([%.0Lf], [long double], [
+#include <gmp.h>
+         ], [gmp_],,
+         [AC_DEFINE([NPRINTF_L], 1, [gmp_printf cannot read long double])])
+
+MPFR_FUNC_PRINTF_SPEC([%td], [ptrdiff_t], [
+#if defined (__cplusplus)
+#include <cstddef>
+#else
+#include <stddef.h>
+#endif
+#include "gmp.h"
+    ], [gmp_],,
+    [AC_DEFINE([NPRINTF_T], 1, [gmp_printf cannot read ptrdiff_t])])
+])
diff --git a/acos.c b/acos.c
index 55387722a..69e560f7e 100644
--- a/acos.c
+++ b/acos.c
@@ -1,6 +1,6 @@
 /* mpfr_acos -- arc-cosinus of a floating-point number
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library, and was contributed by Mathieu Dutour.
diff --git a/acosh.c b/acosh.c
index c5f6ada3e..1d0c42781 100644
--- a/acosh.c
+++ b/acosh.c
@@ -1,6 +1,6 @@
 /* mpfr_acosh -- inverse hyperbolic cosine
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/add.c b/add.c
index a4303f0cf..ca50a2d17 100644
--- a/add.c
+++ b/add.c
@@ -1,6 +1,6 @@
 /* mpfr_add -- add two floating-point numbers
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/add1.c b/add1.c
index 9ae430a9f..f5f30308f 100644
--- a/add1.c
+++ b/add1.c
@@ -1,6 +1,6 @@
 /* mpfr_add1 -- internal function to perform a "real" addition
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/add1sp.c b/add1sp.c
index ef9358f5d..0b253e258 100644
--- a/add1sp.c
+++ b/add1sp.c
@@ -1,7 +1,7 @@
 /* mpfr_add1sp -- internal function to perform a "real" addition
    All the op must have the same precision
 
-Copyright 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/add_d.c b/add_d.c
index ca902ead3..2fe8fa2a1 100644
--- a/add_d.c
+++ b/add_d.c
@@ -1,7 +1,7 @@
 /* mpfr_add_d -- add a multiple precision floating-point number
                  to a machine double precision float
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/add_ui.c b/add_ui.c
index be8c47f6f..f1b4d3d69 100644
--- a/add_ui.c
+++ b/add_ui.c
@@ -1,6 +1,6 @@
 /* mpfr_add_ui -- add a floating-point number with a machine integer
 
-Copyright 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/agm.c b/agm.c
index 85eb85b82..1d78bc10b 100644
--- a/agm.c
+++ b/agm.c
@@ -1,6 +1,6 @@
 /* mpfr_agm -- arithmetic-geometric mean of two floating-point numbers
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/asin.c b/asin.c
index 4e69f3a96..4ad8d8d09 100644
--- a/asin.c
+++ b/asin.c
@@ -1,6 +1,6 @@
 /* mpfr_asin -- arc-sinus of a floating-point number
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library, and was contributed by Mathieu Dutour.
diff --git a/asinh.c b/asinh.c
index e4e82f2ca..2bb7c4764 100644
--- a/asinh.c
+++ b/asinh.c
@@ -1,6 +1,6 @@
 /* mpfr_asinh -- inverse hyperbolic sine
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/atan.c b/atan.c
index 3b1cf2ce1..17b65aa1c 100644
--- a/atan.c
+++ b/atan.c
@@ -1,6 +1,6 @@
 /* mpfr_atan -- arc-tangent of a floating-point number
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library, and was contributed by Mathieu Dutour.
diff --git a/atan2.c b/atan2.c
index 369676e47..b08d394c7 100644
--- a/atan2.c
+++ b/atan2.c
@@ -1,6 +1,6 @@
 /* mpfr_atan2 -- arc-tan 2 of a floating-point number
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library, and was contributed by Mathieu Dutour.
diff --git a/atanh.c b/atanh.c
index 5c4246f81..b0183ad59 100644
--- a/atanh.c
+++ b/atanh.c
@@ -1,6 +1,6 @@
 /* mpfr_atanh -- Inverse Hyperbolic Tangente
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/cache.c b/cache.c
index b5b2de133..4c6015fb7 100644
--- a/cache.c
+++ b/cache.c
@@ -1,6 +1,6 @@
 /* mpfr_cache -- cache interface for multi-precision const in MPFR.
 
-Copyright 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/cbrt.c b/cbrt.c
index 413d08bbe..923f4c304 100644
--- a/cbrt.c
+++ b/cbrt.c
@@ -1,6 +1,6 @@
 /* mpfr_cbrt -- cube root function.
 
-Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/check.c b/check.c
index 644f0fdee..88db5ae9c 100644
--- a/check.c
+++ b/check.c
@@ -1,6 +1,6 @@
 /* mpfr_check -- Check if a floating-point number has not been corrupted.
 
-Copyright 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/clear.c b/clear.c
index 7a7a03d94..25a84dfa1 100644
--- a/clear.c
+++ b/clear.c
@@ -1,6 +1,6 @@
 /* mpfr_clear -- free the memory space allocated for a floating-point number
 
-Copyright 1999, 2000, 2001, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/clears.c b/clears.c
index d58554125..02e6716c3 100644
--- a/clears.c
+++ b/clears.c
@@ -1,7 +1,7 @@
 /* mpfr_clears --  free the memory space allocated for several
    floating-point numbers
 
-Copyright 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/cmp.c b/cmp.c
index 91b869a47..61df83200 100644
--- a/cmp.c
+++ b/cmp.c
@@ -1,6 +1,6 @@
 /* mpfr_cmp -- compare two floating-point numbers
 
-Copyright 1999, 2001, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/cmp2.c b/cmp2.c
index f1953a96f..47740e5f6 100644
--- a/cmp2.c
+++ b/cmp2.c
@@ -1,6 +1,6 @@
 /* mpfr_cmp2 -- exponent shift when subtracting two numbers.
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/cmp_abs.c b/cmp_abs.c
index c782e0827..e7062fe17 100644
--- a/cmp_abs.c
+++ b/cmp_abs.c
@@ -1,6 +1,6 @@
 /* mpfr_cmpabs -- compare the absolute values of two FP numbers
 
-Copyright 1999, 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/cmp_d.c b/cmp_d.c
index 67ac35b12..45c329c0c 100644
--- a/cmp_d.c
+++ b/cmp_d.c
@@ -1,6 +1,6 @@
 /* mpfr_cmp_d -- compare a floating-point number with a double
 
-Copyright 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/cmp_ld.c b/cmp_ld.c
index 2b93aab6d..5b4e3caf8 100644
--- a/cmp_ld.c
+++ b/cmp_ld.c
@@ -1,6 +1,6 @@
 /* mpfr_cmp_d -- compare a floating-point number with a long double
 
-Copyright 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/cmp_si.c b/cmp_si.c
index bbeca4ad5..9a95b819e 100644
--- a/cmp_si.c
+++ b/cmp_si.c
@@ -1,7 +1,7 @@
 /* mpfr_cmp_si_2exp -- compare a floating-point number with a signed
 machine integer multiplied by a power of 2
 
-Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/cmp_ui.c b/cmp_ui.c
index 5fdf453ad..29843eb18 100644
--- a/cmp_ui.c
+++ b/cmp_ui.c
@@ -1,7 +1,7 @@
 /* mpfr_cmp_ui_2exp -- compare a floating-point number with an unsigned
 machine integer multiplied by a power of 2
 
-Copyright 1999, 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/comparisons.c b/comparisons.c
index 1a39110fe..6688bbf94 100644
--- a/comparisons.c
+++ b/comparisons.c
@@ -1,6 +1,6 @@
 /* comparison predicates
 
-Copyright 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/configure.in b/configure.in
index 876e75a23..b0358763a 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_COPYRIGHT([
-Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -54,22 +54,30 @@ AC_ARG_WITH(gmp_lib,
   ])
 AC_ARG_WITH(gmp,
    [  --with-gmp=DIR          GMP install directory ], [
-   CPPFLAGS="$CPPFLAGS -I$withval/include"
-   LDFLAGS="$LDFLAGS -L$withval/lib"
-   gmp_lib_path="$withval/lib"
+   if test -z "$with_gmp_lib" -a -z "$with_gmp_include" ; then
+      CPPFLAGS="$CPPFLAGS -I$withval/include"
+      LDFLAGS="$LDFLAGS -L$withval/lib"
+      gmp_lib_path="$withval/lib"
+   else
+      AC_MSG_FAILURE([Do not use --with-gmp and --with-gmp-include/--with-gmp-lib options simultaneously.])
+   fi
   ])
 
 AC_ARG_WITH(gmp_build,
    [  --with-gmp-build=DIR    GMP build directory (please read INSTALL file)],
    [
-    CPPFLAGS="$CPPFLAGS -I$withval -I$withval/tune"
-    LDFLAGS="$LDFLAGS -L$withval -L$withval/.libs -L$withval/tune/"
-    gmp_lib_path="$withval$PATH_SEPARATOR$withval/.libs$PATH_SEPARATOR$withval/tune"
-    if test -r $withval/Makefile ; then
-     GMP_CFLAGS=`grep -w "CFLAGS =" $withval/Makefile | sed 's/CFLAGS = //'`
-     GMP_CC=`grep -w "CC =" $withval/Makefile | sed 's/CC = //'`
-    fi
-    use_gmp_build=yes
+   if test -z "$gmp_lib_path" -a -z "$with_gmp_include" ; then
+      CPPFLAGS="$CPPFLAGS -I$withval -I$withval/tune"
+      LDFLAGS="$LDFLAGS -L$withval -L$withval/.libs -L$withval/tune/"
+      gmp_lib_path="$withval$PATH_SEPARATOR$withval/.libs$PATH_SEPARATOR$withval/tune"
+      if test -r $withval/Makefile ; then
+         GMP_CFLAGS=`grep -w "CFLAGS =" $withval/Makefile | sed 's/CFLAGS = //'`
+         GMP_CC=`grep -w "CC =" $withval/Makefile | sed 's/CC = //'`
+      fi
+      use_gmp_build=yes
+   else
+      AC_MSG_FAILURE([Do not use --with-gmp-build and other --with-gmp options simultaneously.])
+   fi
    ])
 
 AC_ARG_WITH(mulhigh_size,
@@ -441,14 +449,18 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[
 #include "gmp.h"
 ]], [[
   char buffer[100];
-  if (__GNU_MP_VERSION_PATCHLEVEL != 0)
-    sprintf (buffer, "%d.%d.%d", __GNU_MP_VERSION, __GNU_MP_VERSION_MINOR,
-	    __GNU_MP_VERSION_PATCHLEVEL);
-  else
-    sprintf (buffer, "%d.%d", __GNU_MP_VERSION, __GNU_MP_VERSION_MINOR);
+  sprintf (buffer, "%d.%d.%d", __GNU_MP_VERSION, __GNU_MP_VERSION_MINOR,
+           __GNU_MP_VERSION_PATCHLEVEL);
   printf ("(%s/%s) ", buffer, gmp_version);
+  if (strcmp (buffer, gmp_version) == 0)
+    return 0;
+  if (__GNU_MP_VERSION_PATCHLEVEL != 0)
+    return 1;
+  sprintf (buffer, "%d.%d", __GNU_MP_VERSION, __GNU_MP_VERSION_MINOR);
   return (strcmp (buffer, gmp_version) != 0) ? 1 : 0;
-]])], [AC_MSG_RESULT(yes)],
+]])],
+   [AC_MSG_RESULT(yes)
+    MPFR_CHECK_PRINTF_SPEC],
    [AC_MSG_RESULT(no)
     AC_MSG_WARN(['gmp.h' and 'libgmp' seems to have different versions or])
     AC_MSG_WARN([we cannot run a program linked with GMP (if you cannot])
diff --git a/const_catalan.c b/const_catalan.c
index 82c681920..51f14f65c 100644
--- a/const_catalan.c
+++ b/const_catalan.c
@@ -1,6 +1,6 @@
 /* mpfr_const_catalan -- compute Catalan's constant.
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/const_euler.c b/const_euler.c
index ad0e72236..0eb17e176 100644
--- a/const_euler.c
+++ b/const_euler.c
@@ -1,6 +1,6 @@
 /* mpfr_const_euler -- Euler's constant
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/const_log2.c b/const_log2.c
index e4a69ea2b..198ac6d67 100644
--- a/const_log2.c
+++ b/const_log2.c
@@ -1,6 +1,6 @@
 /* mpfr_const_log2 -- compute natural logarithm of 2
 
-Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/const_pi.c b/const_pi.c
index fdc0dbc1d..19599c009 100644
--- a/const_pi.c
+++ b/const_pi.c
@@ -1,6 +1,6 @@
 /* mpfr_const_pi -- compute Pi
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/constant.c b/constant.c
index 7c5cced54..fd9a04990 100644
--- a/constant.c
+++ b/constant.c
@@ -1,6 +1,6 @@
 /* MPFR internal constant FP numbers
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/copysign.c b/copysign.c
index 3adbb1f17..a9d7c875b 100644
--- a/copysign.c
+++ b/copysign.c
@@ -1,6 +1,6 @@
 /* mpfr_copysign -- Produce a value with the magnitude of x and sign bit of y
 
-Copyright 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/cos.c b/cos.c
index b15c887fa..e2601a8a8 100644
--- a/cos.c
+++ b/cos.c
@@ -1,6 +1,6 @@
 /* mpfr_cos -- cosine of a floating-point number
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/cosh.c b/cosh.c
index baf5ed3ec..4be37ba66 100644
--- a/cosh.c
+++ b/cosh.c
@@ -1,6 +1,6 @@
 /* mpfr_cosh -- hyperbolic cosine
 
-Copyright 2001, 2002, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/cot.c b/cot.c
index 4ea2d58e7..bae8adcf2 100644
--- a/cot.c
+++ b/cot.c
@@ -1,6 +1,6 @@
 /* mpfr_cot - cotangent function.
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/coth.c b/coth.c
index fb162a046..c34071230 100644
--- a/coth.c
+++ b/coth.c
@@ -1,6 +1,6 @@
 /* mpfr_coth - Hyperbolic cotangent function.
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/csc.c b/csc.c
index 15f275c0d..61050378c 100644
--- a/csc.c
+++ b/csc.c
@@ -1,6 +1,6 @@
 /* mpfr_csc - cosecant function.
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/csch.c b/csch.c
index 47005ad82..dbd42ee99 100644
--- a/csch.c
+++ b/csch.c
@@ -1,6 +1,6 @@
 /* mpfr_csch - Hyperbolic cosecant function.
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/d_div.c b/d_div.c
index 188d227f0..44a4a4066 100644
--- a/d_div.c
+++ b/d_div.c
@@ -1,7 +1,7 @@
 /* mpfr_d_div -- divide a machine double precision float
                  by a multiple precision floating-point number
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/d_sub.c b/d_sub.c
index 954722bfe..7306dc332 100644
--- a/d_sub.c
+++ b/d_sub.c
@@ -1,7 +1,7 @@
 /* mpfr_d_sub -- subtract a multiple precision floating-point number
                  from a machine double precision float
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/dim.c b/dim.c
index 0b49d4f57..44dc94df1 100644
--- a/dim.c
+++ b/dim.c
@@ -1,6 +1,6 @@
 /* mpfr_dim -- positive difference
 
-Copyright 2001, 2002, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/div.c b/div.c
index 1a8f67aa9..6138eb8f3 100644
--- a/div.c
+++ b/div.c
@@ -1,6 +1,6 @@
 /* mpfr_div -- divide two floating-point numbers
 
-Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/div_2exp.c b/div_2exp.c
index cdc985ed3..efa63317c 100644
--- a/div_2exp.c
+++ b/div_2exp.c
@@ -1,6 +1,6 @@
 /* mpfr_div_2exp -- divide a floating-point number by a power of two
 
-Copyright 1999, 2001, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/div_2si.c b/div_2si.c
index 69ff08d8f..57684ff38 100644
--- a/div_2si.c
+++ b/div_2si.c
@@ -1,6 +1,6 @@
 /* mpfr_div_2si -- divide a floating-point number by a power of two
 
-Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/div_2ui.c b/div_2ui.c
index 93ae1c87a..3e9186556 100644
--- a/div_2ui.c
+++ b/div_2ui.c
@@ -1,6 +1,6 @@
 /* mpfr_div_2ui -- divide a floating-point number by a power of two
 
-Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/div_d.c b/div_d.c
index f910e8c2c..372057847 100644
--- a/div_d.c
+++ b/div_d.c
@@ -1,7 +1,7 @@
 /* mpfr_div_d -- divide a multiple precision floating-point number
                  by a machine double precision float
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/div_ui.c b/div_ui.c
index bbbb02169..919fb9fac 100644
--- a/div_ui.c
+++ b/div_ui.c
@@ -1,6 +1,6 @@
 /* mpfr_div_{ui,si} -- divide a floating-point number by a machine integer
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/dump.c b/dump.c
index ffe8455ca..76cc5655c 100644
--- a/dump.c
+++ b/dump.c
@@ -1,6 +1,6 @@
 /* mpfr_dump -- Dump a float to stdout.
 
-Copyright 1999, 2001, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/eint.c b/eint.c
index 354682f85..7211b6147 100644
--- a/eint.c
+++ b/eint.c
@@ -1,6 +1,6 @@
 /* mpfr_eint, mpfr_eint1 -- the exponential integral
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/eq.c b/eq.c
index 427f8dd75..5e4e57e7a 100644
--- a/eq.c
+++ b/eq.c
@@ -1,6 +1,6 @@
 /* mpfr_eq -- Compare two floats up to a specified bit #.
 
-Copyright 1999, 2001, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/erf.c b/erf.c
index d7a7db925..ddf699b1c 100644
--- a/erf.c
+++ b/erf.c
@@ -1,6 +1,6 @@
 /* mpfr_erf -- error function of a floating-point number
 
-Copyright 2001, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by Ludovic Meunier and Paul Zimmermann.
 
 This file is part of the GNU MPFR Library.
diff --git a/erfc.c b/erfc.c
index 3368d8a08..9fea237a2 100644
--- a/erfc.c
+++ b/erfc.c
@@ -1,6 +1,6 @@
 /* mpfr_erfc -- The Complementary Error Function of a floating-point number
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/exceptions.c b/exceptions.c
index 99950b4ca..7d441cf61 100644
--- a/exceptions.c
+++ b/exceptions.c
@@ -1,6 +1,6 @@
 /* Exception flags and utilities.
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/exp.c b/exp.c
index 471a5f6bd..10e859c9c 100644
--- a/exp.c
+++ b/exp.c
@@ -1,6 +1,6 @@
 /* mpfr_exp -- exponential of a floating-point number
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/exp10.c b/exp10.c
index 6b3f01812..194a3d7a0 100644
--- a/exp10.c
+++ b/exp10.c
@@ -1,6 +1,6 @@
 /* mpfr_exp10 -- power of 10 function 10^y
 
-Copyright 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/exp2.c b/exp2.c
index df93aa341..ee14fc00c 100644
--- a/exp2.c
+++ b/exp2.c
@@ -1,6 +1,6 @@
 /* mpfr_exp2 -- power of 2 function 2^y
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/exp3.c b/exp3.c
index 9d1114cac..845f78ce4 100644
--- a/exp3.c
+++ b/exp3.c
@@ -1,6 +1,6 @@
 /* mpfr_exp -- exponential of a floating-point number
 
-Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/exp_2.c b/exp_2.c
index 50ba75107..d25f6fac9 100644
--- a/exp_2.c
+++ b/exp_2.c
@@ -1,7 +1,7 @@
 /* mpfr_exp_2 -- exponential of a floating-point number
                  using algorithms in O(n^(1/2)*M(n)) and O(n^(1/3)*M(n))
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/expm1.c b/expm1.c
index 44e332103..5886d18e8 100644
--- a/expm1.c
+++ b/expm1.c
@@ -1,6 +1,6 @@
 /* mpfr_expm1 -- Compute exp(x)-1
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/extract.c b/extract.c
index dcd0ec0bf..4b0af3711 100644
--- a/extract.c
+++ b/extract.c
@@ -1,6 +1,6 @@
 /* mpfr_extract -- bit-extraction function for the binary splitting algorithm
 
-Copyright 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/factorial.c b/factorial.c
index e993eca41..4cfb3238d 100644
--- a/factorial.c
+++ b/factorial.c
@@ -1,6 +1,6 @@
 /* mpfr_fac_ui -- factorial of a non-negative integer
 
-Copyright 2001, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/faq.xsl b/faq.xsl
index 04b40ed86..05d0ba211 100644
--- a/faq.xsl
+++ b/faq.xsl
@@ -28,7 +28,7 @@ wget -q -O - http://www.mpfr.org/faq.html | \
 <xsl:template match="/">
   <xsl:text>&#10;</xsl:text>
   <xsl:comment>
-Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/fits_intmax.c b/fits_intmax.c
index a600578bd..0a9154a61 100644
--- a/fits_intmax.c
+++ b/fits_intmax.c
@@ -1,6 +1,6 @@
 /* mpfr_fits_intmax_p -- test whether an mpfr fits an intmax_t.
 
-Copyright 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -31,11 +31,12 @@ MA 02110-1301, USA. */
 # define __STDC_CONSTANT_MACROS
 #endif
 
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
+#if HAVE_INTTYPES_H
+# include <inttypes.h> /* for intmax_t */
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
 #endif
 
 #include "mpfr-impl.h"
diff --git a/fits_s.h b/fits_s.h
index 0c026dba1..479a3d960 100644
--- a/fits_s.h
+++ b/fits_s.h
@@ -1,6 +1,6 @@
 /* mpfr_fits_*_p -- test whether an mpfr fits a C signed type.
 
-Copyright 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 Copied from mpf/fits_s.h.
 
diff --git a/fits_sint.c b/fits_sint.c
index cbb450fbd..4aea60ff6 100644
--- a/fits_sint.c
+++ b/fits_sint.c
@@ -1,6 +1,6 @@
 /* mpfr_fits_sint_p -- test whether an mpfr fits an int.
 
-Copyright 2003, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2003, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/fits_slong.c b/fits_slong.c
index 2a04602fe..944c49d89 100644
--- a/fits_slong.c
+++ b/fits_slong.c
@@ -1,6 +1,6 @@
 /* mpfr_fits_slong_p -- test whether an mpfr fits a long.
 
-Copyright 2003, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2003, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/fits_sshort.c b/fits_sshort.c
index d0565a56f..f7538465b 100644
--- a/fits_sshort.c
+++ b/fits_sshort.c
@@ -1,6 +1,6 @@
 /* mpfr_fits_sshort_p -- test whether an mpfr fits a short.
 
-Copyright 2003, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2003, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/fits_u.h b/fits_u.h
index 2a7449030..cadc3cfe9 100644
--- a/fits_u.h
+++ b/fits_u.h
@@ -1,6 +1,6 @@
 /* mpfr_fits_*_p -- test whether an mpfr fits a C unsigned type.
 
-Copyright 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/fits_uint.c b/fits_uint.c
index ff2acf6b9..26ee36272 100644
--- a/fits_uint.c
+++ b/fits_uint.c
@@ -1,6 +1,6 @@
 /* mpfr_fits_uint_p -- test whether an mpfr fits an unsigned int.
 
-Copyright 2003, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2003, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/fits_uintmax.c b/fits_uintmax.c
index 5ea55e1c8..0f77a04e1 100644
--- a/fits_uintmax.c
+++ b/fits_uintmax.c
@@ -1,6 +1,6 @@
 /* mpfr_fits_uintmax_p -- test whether an mpfr fits an uintmax_t.
 
-Copyright 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -31,11 +31,12 @@ MA 02110-1301, USA. */
 # define __STDC_CONSTANT_MACROS
 #endif
 
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
+#if HAVE_INTTYPES_H
+# include <inttypes.h> /* for intmax_t */
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
 #endif
 
 #include "mpfr-impl.h"
diff --git a/fits_ulong.c b/fits_ulong.c
index faca303cd..5eae2f12d 100644
--- a/fits_ulong.c
+++ b/fits_ulong.c
@@ -1,6 +1,6 @@
 /* mpfr_fits_ulong_p -- test whether an mpfr fits an unsigned long.
 
-Copyright 2003, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2003, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/fits_ushort.c b/fits_ushort.c
index 69afe7c72..d22e60102 100644
--- a/fits_ushort.c
+++ b/fits_ushort.c
@@ -1,6 +1,6 @@
 /* mpfr_fits_ushort_p -- test whether an mpfr fits an unsigned short.
 
-Copyright 2003, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2003, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/fma.c b/fma.c
index 54026307f..c226cd43f 100644
--- a/fma.c
+++ b/fma.c
@@ -1,6 +1,6 @@
 /* mpfr_fma -- Floating multiply-add
 
-Copyright 2001, 2002, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/fms.c b/fms.c
index 93817cd45..40a25710b 100644
--- a/fms.c
+++ b/fms.c
@@ -1,6 +1,6 @@
 /* mpfr_fms -- Floating multiply-subtract
 
-Copyright 2001, 2002, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/frac.c b/frac.c
index d476d9557..f43e94215 100644
--- a/frac.c
+++ b/frac.c
@@ -1,6 +1,6 @@
 /* mpfr_frac -- Fractional part of a floating-point number.
 
-Copyright 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/free_cache.c b/free_cache.c
index c10070a66..c95e7764a 100644
--- a/free_cache.c
+++ b/free_cache.c
@@ -1,6 +1,6 @@
 /* mpfr_free_cache - Free the cache used by MPFR for internal consts.
 
-Copyright 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/gamma.c b/gamma.c
index d98f9c561..2b8620563 100644
--- a/gamma.c
+++ b/gamma.c
@@ -1,6 +1,6 @@
 /* mpfr_gamma -- gamma function
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/gen_inverse.h b/gen_inverse.h
index daf18ff4f..d978f1ceb 100644
--- a/gen_inverse.h
+++ b/gen_inverse.h
@@ -1,6 +1,6 @@
 /* generic inverse of a function.
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/get_d.c b/get_d.c
index 3496b81d1..f6558b4d9 100644
--- a/get_d.c
+++ b/get_d.c
@@ -1,7 +1,7 @@
 /* mpfr_get_d, mpfr_get_d_2exp -- convert a multiple precision floating-point
                                   number to a machine double precision float
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/get_d64.c b/get_d64.c
index ef820f6b2..0da09df08 100644
--- a/get_d64.c
+++ b/get_d64.c
@@ -5,7 +5,7 @@ See http://gcc.gnu.org/ml/gcc/2006-06/msg00691.html,
 http://gcc.gnu.org/onlinedocs/gcc/Decimal-Float.html,
 and TR 24732 <http://www.open-std.org/jtc1/sc22/wg14/www/projects#24732>.
 
-Copyright 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/get_exp.c b/get_exp.c
index 874dbb316..fb63c4d5b 100644
--- a/get_exp.c
+++ b/get_exp.c
@@ -1,6 +1,6 @@
 /* mpfr_get_exp - get the exponent of a floating-point number
 
-Copyright 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/get_f.c b/get_f.c
index 6ed93c19f..bc02679bf 100644
--- a/get_f.c
+++ b/get_f.c
@@ -1,6 +1,6 @@
 /* mpfr_get_f -- convert a MPFR number to a GNU MPF number
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/get_ld.c b/get_ld.c
index d6a9afb35..42fb4f321 100644
--- a/get_ld.c
+++ b/get_ld.c
@@ -1,7 +1,7 @@
 /* mpfr_get_ld, mpfr_get_ld_2exp -- convert a multiple precision floating-point
                                     number to a machine long double
 
-Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/get_patches.sh b/get_patches.sh
index 114594275..100617dac 100755
--- a/get_patches.sh
+++ b/get_patches.sh
@@ -3,7 +3,7 @@
 cat <<EOF
 /* mpfr_get_patches -- Patches that have been applied
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/get_si.c b/get_si.c
index 7804a7996..33a7677dd 100644
--- a/get_si.c
+++ b/get_si.c
@@ -1,6 +1,6 @@
 /* mpfr_get_si -- convert a floating-point number to a signed long.
 
-Copyright 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/get_sj.c b/get_sj.c
index 0661b04c1..c746fc786 100644
--- a/get_sj.c
+++ b/get_sj.c
@@ -1,6 +1,6 @@
 /* mpfr_get_sj -- convert a MPFR number to a huge machine signed integer
 
-Copyright 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -31,11 +31,12 @@ MA 02110-1301, USA. */
 # define __STDC_CONSTANT_MACROS
 #endif
 
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
+#if HAVE_INTTYPES_H
+# include <inttypes.h> /* for intmax_t */
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
 #endif
 
 #include "mpfr-impl.h"
diff --git a/get_str.c b/get_str.c
index 2d63257b1..fe5808f7c 100644
--- a/get_str.c
+++ b/get_str.c
@@ -1,6 +1,6 @@
 /* mpfr_get_str -- output a floating-point number to a string
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 Contributed by Alain Delplanque and Paul Zimmermann.
 
diff --git a/get_ui.c b/get_ui.c
index 6496e5148..620950800 100644
--- a/get_ui.c
+++ b/get_ui.c
@@ -1,6 +1,6 @@
 /* mpfr_get_ui -- convert a floating-point number to an unsigned long.
 
-Copyright 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/get_uj.c b/get_uj.c
index e9d0dcf5f..5ecda5577 100644
--- a/get_uj.c
+++ b/get_uj.c
@@ -1,6 +1,6 @@
 /* mpfr_get_uj -- convert a MPFR number to a huge machine unsigned integer
 
-Copyright 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -31,11 +31,12 @@ MA 02110-1301, USA. */
 # define __STDC_CONSTANT_MACROS
 #endif
 
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
+#if HAVE_INTTYPES_H
+# include <inttypes.h> /* for intmax_t */
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
 #endif
 
 #include "mpfr-impl.h"
diff --git a/get_z.c b/get_z.c
index 7629d0e97..8616cff95 100644
--- a/get_z.c
+++ b/get_z.c
@@ -1,7 +1,7 @@
 /* mpfr_get_z_exp -- get a multiple-precision integer from
                      a floating-point number
 
-Copyright 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/get_z_exp.c b/get_z_exp.c
index 312f64c51..fba973b90 100644
--- a/get_z_exp.c
+++ b/get_z_exp.c
@@ -1,7 +1,7 @@
 /* mpfr_get_z_exp -- get a multiple-precision integer and an exponent
                      from a floating-point number
 
-Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/gmp_op.c b/gmp_op.c
index 4c932caa2..1f12a6948 100644
--- a/gmp_op.c
+++ b/gmp_op.c
@@ -1,6 +1,6 @@
 /* Implementations of operations between mpfr and mpz/mpq data
 
-Copyright 2001, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/hypot.c b/hypot.c
index f81d12eb7..24dc2ebd2 100644
--- a/hypot.c
+++ b/hypot.c
@@ -1,6 +1,6 @@
 /* mpfr_hypot -- Euclidean distance
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/init.c b/init.c
index cd89a8eff..95026bce5 100644
--- a/init.c
+++ b/init.c
@@ -1,6 +1,6 @@
 /* mpfr_init -- initialize a floating-point number
 
-Copyright 1999, 2001, 2002, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/init2.c b/init2.c
index 9a5363298..61120c42f 100644
--- a/init2.c
+++ b/init2.c
@@ -1,6 +1,6 @@
 /* mpfr_init2 -- initialize a floating-point number with given precision
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/inits.c b/inits.c
index 4b3abf2bc..f0d2b9923 100644
--- a/inits.c
+++ b/inits.c
@@ -1,6 +1,6 @@
 /* mpfr_inits -- initialize several floating-point numbers
 
-Copyright 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/inits2.c b/inits2.c
index 8121cac69..d6cf69628 100644
--- a/inits2.c
+++ b/inits2.c
@@ -1,7 +1,7 @@
 /* mpfr_inits2 -- initialize several floating-point numbers with given
    precision
 
-Copyright 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/inp_str.c b/inp_str.c
index b9991dd70..654ecadf5 100644
--- a/inp_str.c
+++ b/inp_str.c
@@ -1,7 +1,7 @@
 /* mpf_inp_str(dest_float, stream, base) -- Input a number in base
    BASE from stdio stream STREAM and store the result in DEST_FLOAT.
 
-Copyright 1999, 2001, 2002, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 (Copied from GMP, file mpf/inp_str.c)
 
diff --git a/int_ceil_log2.c b/int_ceil_log2.c
index 4973c8f1e..c6302840d 100644
--- a/int_ceil_log2.c
+++ b/int_ceil_log2.c
@@ -1,6 +1,6 @@
 /* __gmpfr_int_ceil_log2 -- Integer ceil of log2(x)
 
-Copyright 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/isinf.c b/isinf.c
index dc2cef3e8..fae424989 100644
--- a/isinf.c
+++ b/isinf.c
@@ -1,6 +1,6 @@
 /* mpfr_inf_p -- check for infinities
 
-Copyright 2000, 2001, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2000, 2001, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/isinteger.c b/isinteger.c
index d06d486d8..fee7dbfb3 100644
--- a/isinteger.c
+++ b/isinteger.c
@@ -1,6 +1,6 @@
 /* mpfr_integer_p -- test if a mpfr variable is integer.
 
-Copyright 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/isnan.c b/isnan.c
index f0d873b58..3f4c1daec 100644
--- a/isnan.c
+++ b/isnan.c
@@ -1,6 +1,6 @@
 /* mpfr_nan_p -- check for NaN
 
-Copyright 2000, 2001, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2000, 2001, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/isnum.c b/isnum.c
index f4589af2e..1f041b70e 100644
--- a/isnum.c
+++ b/isnum.c
@@ -1,6 +1,6 @@
 /* mpfr_number_p -- check for ordinary numbers
 
-Copyright 2000, 2001, 2002, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2000, 2001, 2002, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/isqrt.c b/isqrt.c
index 791fc7391..2368fa54e 100644
--- a/isqrt.c
+++ b/isqrt.c
@@ -1,6 +1,6 @@
 /* __gmpfr_isqrt && __gmpfr_cuberoot -- Integer square root and cube root
 
-Copyright 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/iszero.c b/iszero.c
index 1b860c9e9..1ec552b41 100644
--- a/iszero.c
+++ b/iszero.c
@@ -1,6 +1,6 @@
 /* mpfr_zero_p -- check for infinities
 
-Copyright 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/jn.c b/jn.c
index 460db5060..84153f9bf 100644
--- a/jn.c
+++ b/jn.c
@@ -1,7 +1,7 @@
 /* mpfr_j0, mpfr_j1, mpfr_jn -- Bessel functions of 1st kind, integer order.
    http://www.opengroup.org/onlinepubs/009695399/functions/j0.html
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/jyn_asympt.c b/jyn_asympt.c
index 96da5d0ea..d5c9fe814 100644
--- a/jyn_asympt.c
+++ b/jyn_asympt.c
@@ -1,6 +1,6 @@
 /* mpfr_jn_asympt, mpfr_yn_asympt -- shared code for mpfr_jn and mpfr_yn
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/li2.c b/li2.c
index ef423a759..0efd2a394 100644
--- a/li2.c
+++ b/li2.c
@@ -1,6 +1,6 @@
 /* mpfr_li2 -- Dilogarithm.
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/lngamma.c b/lngamma.c
index 7db10c762..ca318530c 100644
--- a/lngamma.c
+++ b/lngamma.c
@@ -1,6 +1,6 @@
 /* mpfr_lngamma -- lngamma function
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/log.c b/log.c
index d5a791880..da46c4de9 100644
--- a/log.c
+++ b/log.c
@@ -1,6 +1,6 @@
 /* mpfr_log -- natural logarithm of a floating-point number
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/log10.c b/log10.c
index 364c0b1a7..10e304d94 100644
--- a/log10.c
+++ b/log10.c
@@ -1,6 +1,6 @@
 /* mpfr_log10 -- logarithm in base 10.
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/log1p.c b/log1p.c
index 80066ecd9..c3a203770 100644
--- a/log1p.c
+++ b/log1p.c
@@ -1,6 +1,6 @@
 /* mpfr_log1p -- Compute log(1+x)
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/log2.c b/log2.c
index eed3b43fd..233273c34 100644
--- a/log2.c
+++ b/log2.c
@@ -1,6 +1,6 @@
 /* mpfr_log2 -- log base 2
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/logging.c b/logging.c
index 515a9a8d7..753c90873 100644
--- a/logging.c
+++ b/logging.c
@@ -1,6 +1,6 @@
 /* MPFR Logging functions.
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/mbench/Makefile b/mbench/Makefile
index 580c9f147..8fc2b6716 100644
--- a/mbench/Makefile
+++ b/mbench/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 # Contributed by Patrick Pelissier, INRIA.
 # 
 # This file is part of the MPFR Library.
diff --git a/mbench/generate.c b/mbench/generate.c
index d1c45751e..36ff0a7c1 100644
--- a/mbench/generate.c
+++ b/mbench/generate.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by Patrick Pelissier, INRIA.
 
 This file is part of the MPFR Library.
diff --git a/mbench/mfv5-arprec.cc b/mbench/mfv5-arprec.cc
index 82b91cf2c..dd109d720 100644
--- a/mbench/mfv5-arprec.cc
+++ b/mbench/mfv5-arprec.cc
@@ -1,5 +1,5 @@
 /*
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by Patrick Pelissier, INRIA.
 
 This file is part of the MPFR Library.
diff --git a/mbench/mfv5-cln.cc b/mbench/mfv5-cln.cc
index d7a4b6286..fee536a75 100644
--- a/mbench/mfv5-cln.cc
+++ b/mbench/mfv5-cln.cc
@@ -1,5 +1,5 @@
 /*
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by Patrick Pelissier, INRIA.
 
 This file is part of the MPFR Library.
diff --git a/mbench/mfv5-crlibm.cc b/mbench/mfv5-crlibm.cc
index 3fce9c5a0..6326e028a 100644
--- a/mbench/mfv5-crlibm.cc
+++ b/mbench/mfv5-crlibm.cc
@@ -1,5 +1,5 @@
 /*
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by Patrick Pelissier, INRIA.
 
 This file is part of the MPFR Library.
diff --git a/mbench/mfv5-libc.cc b/mbench/mfv5-libc.cc
index fb9519374..de3ffd020 100644
--- a/mbench/mfv5-libc.cc
+++ b/mbench/mfv5-libc.cc
@@ -1,5 +1,5 @@
 /*
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by Patrick Pelissier, INRIA.
 
 This file is part of the MPFR Library.
diff --git a/mbench/mfv5-lidia.cc b/mbench/mfv5-lidia.cc
index c6415b7f4..572484e1f 100644
--- a/mbench/mfv5-lidia.cc
+++ b/mbench/mfv5-lidia.cc
@@ -1,5 +1,5 @@
 /*
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by Patrick Pelissier, INRIA.
 
 This file is part of the MPFR Library.
diff --git a/mbench/mfv5-mpf.cc b/mbench/mfv5-mpf.cc
index fe27b9b3d..5aaebb511 100644
--- a/mbench/mfv5-mpf.cc
+++ b/mbench/mfv5-mpf.cc
@@ -1,5 +1,5 @@
 /*
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by Patrick Pelissier, INRIA.
 
 This file is part of the MPFR Library.
diff --git a/mbench/mfv5-mpfr.cc b/mbench/mfv5-mpfr.cc
index 635149858..d2676a6f4 100644
--- a/mbench/mfv5-mpfr.cc
+++ b/mbench/mfv5-mpfr.cc
@@ -1,5 +1,5 @@
 /*
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by Patrick Pelissier, INRIA.
 
 This file is part of the MPFR Library.
diff --git a/mbench/mfv5-ntl.cc b/mbench/mfv5-ntl.cc
index c8874e3ed..2d872870a 100644
--- a/mbench/mfv5-ntl.cc
+++ b/mbench/mfv5-ntl.cc
@@ -1,5 +1,5 @@
 /*
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by Patrick Pelissier, INRIA.
 
 This file is part of the MPFR Library.
diff --git a/mbench/mfv5-pari.cc b/mbench/mfv5-pari.cc
index b62a640b3..c32099dd6 100644
--- a/mbench/mfv5-pari.cc
+++ b/mbench/mfv5-pari.cc
@@ -1,5 +1,5 @@
 /*
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by Patrick Pelissier, INRIA.
 
 This file is part of the MPFR Library.
diff --git a/mbench/mfv5-void.cc b/mbench/mfv5-void.cc
index 307644d3f..2df3d0ddf 100644
--- a/mbench/mfv5-void.cc
+++ b/mbench/mfv5-void.cc
@@ -1,5 +1,5 @@
 /*
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by Patrick Pelissier, INRIA.
 
 This file is part of the MPFR Library.
diff --git a/mbench/mfv5.cc b/mbench/mfv5.cc
index b7638e073..459ba6567 100644
--- a/mbench/mfv5.cc
+++ b/mbench/mfv5.cc
@@ -1,5 +1,5 @@
 /*
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by Patrick Pelissier, INRIA.
 
 This file is part of the MPFR Library.
diff --git a/mbench/mfv5.h b/mbench/mfv5.h
index e29068e14..90bc076c7 100644
--- a/mbench/mfv5.h
+++ b/mbench/mfv5.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by Patrick Pelissier, INRIA.
 
 This file is part of the MPFR Library.
diff --git a/mbench/mpfr-gfx.c b/mbench/mpfr-gfx.c
index 438743e16..e6b4c641b 100644
--- a/mbench/mpfr-gfx.c
+++ b/mbench/mpfr-gfx.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by Patrick Pelissier, INRIA.
 
 This file is part of the MPFR Library.
diff --git a/mbench/mpfr-v4.c b/mbench/mpfr-v4.c
index 0650a7c40..cb955cee7 100644
--- a/mbench/mpfr-v4.c
+++ b/mbench/mpfr-v4.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by Patrick Pelissier, INRIA.
 
 This file is part of the MPFR Library.
diff --git a/mbench/mpfr-v6.c b/mbench/mpfr-v6.c
index 9fa7b5612..a6390cbc7 100644
--- a/mbench/mpfr-v6.c
+++ b/mbench/mpfr-v6.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by Patrick Pelissier, INRIA.
 
 This file is part of the MPFR Library.
diff --git a/mbench/timp.h b/mbench/timp.h
index 2450241b1..959887fc3 100644
--- a/mbench/timp.h
+++ b/mbench/timp.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by Patrick Pelissier, INRIA.
 
 This file is part of the MPFR Library.
diff --git a/minmax.c b/minmax.c
index 620cc74bd..2b24a79c1 100644
--- a/minmax.c
+++ b/minmax.c
@@ -1,6 +1,6 @@
 /* mpfr_min -- min and max of x, y
 
-Copyright 2001, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/modf.c b/modf.c
index fc2791565..e7a649870 100644
--- a/modf.c
+++ b/modf.c
@@ -1,6 +1,6 @@
 /* mpfr_modf -- Integral and fractional part.
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/mp_clz_tab.c b/mp_clz_tab.c
index 26d20ab86..3e041e000 100644
--- a/mp_clz_tab.c
+++ b/mp_clz_tab.c
@@ -3,7 +3,7 @@
    THE CONTENTS OF THIS FILE ARE FOR INTERNAL USE AND MAY CHANGE
    INCOMPATIBLY OR DISAPPEAR IN A FUTURE GNU MP RELEASE.
 
-Copyright 1991, 1993, 1994, 1996, 1997, 2000, 2001, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1991, 1993, 1994, 1996, 1997, 2000, 2001, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
 This file is part of the GNU MP Library.
 Adapted to be used by the GNU MPFR library.
diff --git a/mparam_h.in b/mparam_h.in
index 1d8a49e62..af6029615 100644
--- a/mparam_h.in
+++ b/mparam_h.in
@@ -1,6 +1,6 @@
 /* Various Thresholds of MPFR, not exported.
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
 This file is part of the GNU MPFR Library.
 
diff --git a/mpf2mpfr.h b/mpf2mpfr.h
index d1a12d83e..0b89eefa8 100644
--- a/mpf2mpfr.h
+++ b/mpf2mpfr.h
@@ -1,6 +1,6 @@
 /* mpf2mpfr.h -- Compatibility include file with mpf.
 
-Copyright 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/mpfr-gmp.c b/mpfr-gmp.c
index c827a4077..99d816431 100644
--- a/mpfr-gmp.c
+++ b/mpfr-gmp.c
@@ -1,7 +1,7 @@
 /* mpfr_gmp -- Limited gmp-impl emulator
    Modified version of the GMP files.
 
-Copyright 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/mpfr-gmp.h b/mpfr-gmp.h
index 799503216..6d8733e20 100644
--- a/mpfr-gmp.h
+++ b/mpfr-gmp.h
@@ -1,6 +1,6 @@
 /* Interface to replace gmp-impl.h
 
-Copyright 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/mpfr-impl.h b/mpfr-impl.h
index 4067d54e7..9692ae5b9 100644
--- a/mpfr-impl.h
+++ b/mpfr-impl.h
@@ -1,6 +1,6 @@
 /* Utilities for MPFR developers, not exported.
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -395,7 +395,7 @@ static double double_zero = 0.0;
 # define DBL_NEG_ZERO (-0.0)
 #endif
 
-/* for x of type ieee_double_extract */
+/* Note: the argument x must be a lvalue of type double. */
 #if _GMP_IEEE_FLOATS
 typedef union ieee_double_extract Ieee_double_extract;
 
@@ -407,13 +407,21 @@ typedef union ieee_double_extract Ieee_double_extract;
                          ((((Ieee_double_extract *)&(x))->s.manl != 0) || \
                          (((Ieee_double_extract *)&(x))->s.manh != 0)))
 #else
-# define DOUBLE_ISINF(x) ((x) > DBL_MAX || (x) < -DBL_MAX)
+/* Below, the &(x) == &(x) || &(x) != &(x) allows to make sure that x
+   is a lvalue without (probably) any warning from the compiler.  The
+   &(x) != &(x) is needed to avoid a failure under Mac OS X 10.4.11
+   (with Xcode 2.4.1, i.e. the latest one). */
+# define LVALUE(x) (&(x) == &(x) || &(x) != &(x))
+# define DOUBLE_ISINF(x) (LVALUE(x) && ((x) > DBL_MAX || (x) < -DBL_MAX))
 # ifdef MPFR_NANISNAN
-/* Avoid MIPSpro / IRIX64 (incorrect) optimizations.
-   The + must not be replaced by a ||. */
-#  define DOUBLE_ISNAN(x) (!(((x) >= 0.0) + ((x) <= 0.0)))
+/* Avoid MIPSpro / IRIX64 / gcc -ffast-math (incorrect) optimizations.
+   The + must not be replaced by a ||. With gcc -ffast-math, NaN is
+   regarded as a positive number or something like that; the second
+   test catches this case. */
+#  define DOUBLE_ISNAN(x) \
+    (LVALUE(x) && !((((x) >= 0.0) + ((x) <= 0.0)) && -(x)*(x) <= 0.0))
 # else
-#  define DOUBLE_ISNAN(x) ((x) != (x))
+#  define DOUBLE_ISNAN(x) (LVALUE(x) && (x) != (x))
 # endif
 #endif
 
diff --git a/mpfr-thread.h b/mpfr-thread.h
index 17fb1c43f..14768b7cb 100644
--- a/mpfr-thread.h
+++ b/mpfr-thread.h
@@ -1,6 +1,6 @@
 /* MPFR internal header related to thread-local variables.
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/mpfr.h b/mpfr.h
index fdb54a95e..7e5f82dc7 100644
--- a/mpfr.h
+++ b/mpfr.h
@@ -1,6 +1,6 @@
 /* mpfr.h -- Include file for mpfr.
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/mpfr.texi b/mpfr.texi
index 1d2384c51..58d1e54a2 100644
--- a/mpfr.texi
+++ b/mpfr.texi
@@ -445,8 +445,8 @@ be extracted using @samp{cc -V} on some machines, or, if you're using gcc,
 version (the GMP version may be useful too).
 
 If your bug report is good, we will do our best to help you to get a corrected
-version of the library; if the bug report is poor, we won't do anything about
-it (aside of chiding you to send better bug reports).
+version of the library; if the bug report is poor, we will not do anything
+about it (aside of chiding you to send better bug reports).
 
 Send your bug report to: @samp{mpfr@@loria.fr}.
 
@@ -500,11 +500,14 @@ gcc myprogram.c -lmpfr -lgmp
 
 @cindex Libtool
 MPFR is built using Libtool and an application can use that to link if
-desired, @MPFRpxreftop{libtool, GNU Libtool}
-@c Note: Do not try the above cross reference without moving mpfr.info
-@c into some "safe" place first. Due to a poor design, "info" will not
-@c find the correct libtool info file because of the "libtool" script
-@c in MPFR's directory!
+desired, @MPFRpxreftop{libtool.info, GNU Libtool}
+@c Note: the .info extension has been added to avoid the following bug:
+@c   http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=484740
+@c which occurs when reading the info file from the build directory:
+@c   info ./mpfr    or    info -f ./mpfr.info
+@c Due to a poor design, the "info" utility will not find the correct
+@c libtool info file if the .info extension is not provided, because of
+@c the "libtool" script in MPFR's directory!
 
 If MPFR has been installed to a non-standard location, then it may be
 necessary to set up environment variables such as @samp{C_INCLUDE_PATH}
@@ -604,7 +607,7 @@ For efficiency reasons, avoid to initialize and clear out a variable in loops.
 Instead, initialize it before entering the loop, and clear it out after the
 loop has exited.
 
-You don't need to be concerned about allocating additional space for MPFR
+You do not need to be concerned about allocating additional space for MPFR
 variables, since any variable has a significand of fixed size.
 Hence unless you change its precision, or clear and reinitialize it,
 a floating-point variable will have the same allocated space during all its
@@ -988,7 +991,7 @@ Note that the input 0 is converted to +0 by @code{mpfr_set_ui},
 @code{mpfr_set_si}, @code{mpfr_set_sj}, @code{mpfr_set_uj},
 @code{mpfr_set_z}, @code{mpfr_set_q} and
 @code{mpfr_set_f}, regardless of the rounding mode.
-If the system doesn't support the IEEE-754 standard, @code{mpfr_set_d},
+If the system does not support the IEEE-754 standard, @code{mpfr_set_d},
 @code{mpfr_set_ld} and
 @code{mpfr_set_decimal64} might not preserve the signed zeros.
 The @code{mpfr_set_decimal64} function is built only with the configure
@@ -1019,10 +1022,12 @@ Note that the input 0 is converted to +0.
 @end deftypefun
 
 @deftypefun int mpfr_set_str (mpfr_t @var{rop}, const char *@var{s}, int @var{base}, mp_rnd_t @var{rnd})
-Set @var{rop} to the value of the whole string @var{s} in base @var{base},
+Set @var{rop} to the value of the string @var{s} in base @var{base},
 rounded in the direction @var{rnd}.
 See the documentation of @code{mpfr_strtofr} for a detailed description
 of the valid string formats.
+Contrary to @code{mpfr_strtofr}, @code{mpfr_set_str} requires the
+@emph{whole} string to represent a valid floating-point number.
 @c Additionally, special values
 @c @code{@@NaN@@}, @code{@@Inf@@}, @code{+@@Inf@@} and @code{-@@Inf@@},
 @c all case insensitive, without leading whitespace and possibly followed by
@@ -1257,12 +1262,12 @@ Free a string allocated by @code{mpfr_get_str} using the current unallocation
 function (preliminary interface).
 The block is assumed to be @code{strlen(@var{str})+1} bytes.
 For more information about how it is done:
-@ifnothtml
-@pxref{Custom Allocation,,, gmp,GNU MP}.
-@end ifnothtml
-@ifhtml
-see section ``Custom Allocation'' in @cite{GNU MP}.
-@end ifhtml
+@ifinfo
+@pxref{Custom Allocation,,, gmp.info,GNU MP}.
+@end ifinfo
+@ifnotinfo
+see Section ``Custom Allocation'' in @cite{GNU MP}.
+@end ifnotinfo
 @end deftypefun
 
 @deftypefun int mpfr_fits_ulong_p (mpfr_t @var{op}, mp_rnd_t @var{rnd})
@@ -1738,7 +1743,7 @@ rounded in the direction @var{rnd}.
 @deftypefun int mpfr_j0 (mpfr_t @var{rop}, mpfr_t @var{op}, mp_rnd_t @var{rnd})
 @deftypefunx int mpfr_j1 (mpfr_t @var{rop}, mpfr_t @var{op}, mp_rnd_t @var{rnd})
 @deftypefunx int mpfr_jn (mpfr_t @var{rop}, long @var{n}, mpfr_t @var{op}, mp_rnd_t @var{rnd})
-Set @var{rop} to the value of the first order Bessel function of order 0, 1
+Set @var{rop} to the value of the first kind Bessel function of order 0, 1
 and @var{n} on @var{op}, rounded in the direction @var{rnd}. When @var{op} is
 NaN, @var{rop} is always set to NaN. When @var{op} is plus or minus Infinity,
 @var{rop} is set to +0. When @var{op} is zero, and @var{n} is not zero,
@@ -1749,7 +1754,7 @@ and the sign of @var{op}.
 @deftypefun int mpfr_y0 (mpfr_t @var{rop}, mpfr_t @var{op}, mp_rnd_t @var{rnd})
 @deftypefunx int mpfr_y1 (mpfr_t @var{rop}, mpfr_t @var{op}, mp_rnd_t @var{rnd})
 @deftypefunx int mpfr_yn (mpfr_t @var{rop}, long @var{n}, mpfr_t @var{op}, mp_rnd_t @var{rnd})
-Set @var{rop} to the value of the second order Bessel function of order 0, 1
+Set @var{rop} to the value of the second kind Bessel function of order 0, 1
 and @var{n} on @var{op}, rounded in the direction @var{rnd}. When @var{op} is
 NaN or negative,
 @var{rop} is always set to NaN. When @var{op} is +Inf,
@@ -1913,27 +1918,54 @@ The format specification accepted by @code{mpfr_printf} is an extension of the
 the standard C function @code{printf} (in particular, notice that the
 precision is related to the number of digits displayed in the base chosen by
 @samp{conv} and not related to the internal precision of the @code{mpfr_t}
-variable).  @code{mpfr_printf} is an extension to the @code{gmp_printf}
-function, hence it accepts the same @samp{type} specifiers plus the following
-two:
+variable).  @code{mpfr_printf} accepts the same @samp{type} specifiers as
+@code{gmp} (except the non-standard and deprecated @samp{q}, use @samp{ll}
+instead), plus @samp{R} and @samp{P}:
+
 @quotation
 @multitable {(space)} {MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM}
+@item @samp{h}  @tab @code{short}
+@item @samp{hh} @tab @code{char}
+@item @samp{j}  @tab @code{intmax_t} or @code{uintmax_t}
+@item @samp{l}  @tab @code{long} or @code{wchar_t}
+@item @samp{ll} @tab @code{long long}
+@item @samp{L}  @tab @code{long double}
+@item @samp{t}  @tab @code{ptrdiff_t}
+@item @samp{z}  @tab @code{size_t}
+
+@item @samp{F}  @tab @code{mpf_t}, float conversions
+@item @samp{Q}  @tab @code{mpq_t}, integer conversions
+@item @samp{M}  @tab @code{mp_limb_t}, integer conversions
+@item @samp{N}  @tab @code{mp_limb_t} array, integer conversions
+@item @samp{Z}  @tab @code{mpz_t}, integer conversions
+
 @item @samp{R}  @tab @code{mpfr_t} input, float conversions
 @item @samp{P}  @tab @code{mpfr_prec_t} input, integer conversions
 @end multitable
 @end quotation
-The @samp{type} specifiers have the same restrictions as those mentioned in
-the GMP documentation, for instance, only @samp{h} and @samp{l} are portable;
-moreover, @samp{M}, @samp{j}, @samp{ll}, or @samp{q} are not supported if your
-GMP library does not support them.
-The @samp{rounding} specifier is specific to @code{mpfr_t}
-parameter and shall not be used with other types. @code{mpfr_printf} accepts
-the same conversion specifier character @samp{conv} as @code{gmp_printf} plus
-@samp{b}.
+
+The @samp{type} specifiers have the same restrictions as those
+mentioned in the GMP documentation:
+@ifinfo
+@pxref{Formatted Output Strings,,, gmp.info,GNU MP}.
+@end ifinfo
+@ifnotinfo
+see Section ``Formatted Output Strings''' in @cite{GNU MP}.
+@end ifnotinfo
+More precisely, except for @samp{R} and @samp{P}
+(which are defined by MPFR), the @samp{type} specifiers are supported
+only if they are supported by @code{gmp_printf} in your GMP build;
+this implies that the standard specifiers, such as @samp{t}, must
+@emph{also} be supported by your C library if you want to use them.
+
+The @samp{rounding} specifier is specific to @code{mpfr_t} parameter and shall
+not be used with other types. @code{mpfr_printf} accepts the same conversion
+specifier character @samp{conv} as @code{gmp_printf} plus @samp{b}.
 
 The @samp{P} type outputs the precision of an @code{mpfr_t} variable.
-It is needed because the @code{mpfr_prec_t} type doesn't necessarily
-correspond to an unsigned int or any fixed standard type. For example:
+It is needed because the @code{mpfr_prec_t} type does not necessarily
+correspond to an @code{unsigned int} or any fixed standard type.
+For example:
 @example
 mpfr_t x;
 mpfr_prec_t p;
@@ -1945,6 +1977,7 @@ mpfr_printf ("variable x with %Pu bits", p);
 
 The @samp{R} type is used for a @code{mpfr_t} output and can be followed by
 a rounding specifier denoted by one of the following characters:
+
 @quotation
 @multitable {(space)} {MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM}
 @item @samp{U}  @tab round toward plus infinity
@@ -1955,6 +1988,7 @@ a rounding specifier denoted by one of the following characters:
 argument just before the corresponding @code{mpfr_t} variable.
 @end multitable
 @end quotation
+
 If the precision field is not empty, the @code{mpfr_t} number is rounded to
 the given precision in the direction specified by the rounding mode.
 If the precision field is empty (as in @samp{%.Rf}), the number is displayed
@@ -1975,6 +2009,7 @@ mpfr_printf ("%.128R*f", GMP_RNDN, x);
 displays the @code{mpfr_t} parameter in binary, the behavior is undefined with
 other parameter type.
 The @samp{conv} specifiers allowed with @code{mpfr_t} parameter are:
+
 @quotation
 @multitable {(space)} {MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM}
 @item @samp{a} @samp{A} @tab hex float, C99 style
@@ -1984,6 +2019,7 @@ The @samp{conv} specifiers allowed with @code{mpfr_t} parameter are:
 @item @samp{g} @samp{G} @tab fixed or scientific float
 @end multitable
 @end quotation
+
 In case of non-decimal output, only the significand is written in the
 specified base, the exponent is always displayed in decimal.
 Special values are always displayed as @code{nan}, @code{-inf}, and
@@ -2723,7 +2759,7 @@ with @code{mpfr_custom_init_set} is undefined.
 
 @deftypefun mp_exp_t mpfr_custom_get_exp (mpfr_t @var{x})
 Return the exponent of @var{x}, assuming that @var{x} is a non-zero ordinary
-number. The return value for NaN, Infinity or Zero is unspecified but doesn't
+number. The return value for NaN, Infinity or Zero is unspecified but does not
 produce any trap.
 The behavior of this function for any @code{mpfr_t} not initialized
 with @code{mpfr_custom_init_set} is undefined.
diff --git a/mpn_exp.c b/mpn_exp.c
index 89da8c05e..402b5e6bd 100644
--- a/mpn_exp.c
+++ b/mpn_exp.c
@@ -1,6 +1,6 @@
 /* mpfr_mpn_exp -- auxiliary function for mpfr_get_str and mpfr_set_str
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 Contributed by Alain Delplanque and Paul Zimmermann.
 
diff --git a/mul.c b/mul.c
index 9a1186dce..ec1f757e5 100644
--- a/mul.c
+++ b/mul.c
@@ -1,6 +1,6 @@
 /* mpfr_mul -- multiply two floating-point numbers
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/mul_2exp.c b/mul_2exp.c
index 2555a2041..169d76a15 100644
--- a/mul_2exp.c
+++ b/mul_2exp.c
@@ -1,6 +1,6 @@
 /* mpfr_mul_2exp -- multiply a floating-point number by a power of two
 
-Copyright 1999, 2001, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/mul_2si.c b/mul_2si.c
index 857511806..2bb62164c 100644
--- a/mul_2si.c
+++ b/mul_2si.c
@@ -1,6 +1,6 @@
 /* mpfr_mul_2si -- multiply a floating-point number by a power of two
 
-Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/mul_2ui.c b/mul_2ui.c
index 63ca5f459..d81fc92d4 100644
--- a/mul_2ui.c
+++ b/mul_2ui.c
@@ -1,6 +1,6 @@
 /* mpfr_mul_2ui -- multiply a floating-point number by a power of two
 
-Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/mul_d.c b/mul_d.c
index 9cbbe5e5a..76dfbebe0 100644
--- a/mul_d.c
+++ b/mul_d.c
@@ -1,7 +1,7 @@
 /* mpfr_mul_d -- multiply a multiple precision floating-point number
                  by a machine double precision float
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/mul_ui.c b/mul_ui.c
index c37f74ae4..96305c4fd 100644
--- a/mul_ui.c
+++ b/mul_ui.c
@@ -1,7 +1,7 @@
 /* mpfr_mul_ui -- multiply a floating-point number by a machine integer
    mpfr_mul_si -- multiply a floating-point number by a machine integer
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/mulders.c b/mulders.c
index 042aa4e53..13f037e10 100644
--- a/mulders.c
+++ b/mulders.c
@@ -1,6 +1,6 @@
 /* Mulder's MulHigh function (short product)
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/neg.c b/neg.c
index 4d4f03bd5..cc9e1093b 100644
--- a/neg.c
+++ b/neg.c
@@ -1,6 +1,6 @@
 /* mpfr_neg -- change the sign of a floating-point number
 
-Copyright 1999, 2000, 2001, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/next.c b/next.c
index 71b7a7fe5..612eab650 100644
--- a/next.c
+++ b/next.c
@@ -1,7 +1,7 @@
 /* mpfr_nextabove, mpfr_nextbelow, mpfr_nexttoward -- next representable
 floating-point number
 
-Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/nightly-test b/nightly-test
index cef3e3167..8427ed485 100755
--- a/nightly-test
+++ b/nightly-test
@@ -16,7 +16,7 @@ test ! -h "$DIR"
 svn checkout "svn://scm.gforge.inria.fr/svn/mpfr/${BRANCH:-trunk}" "$DIR"
 cd "$DIR"
 autoreconf -i
-./configure --with-gmp="$GMP" --disable-alloca --enable-assert=full \
+./configure --with-gmp="$GMP" --enable-assert=full \
 --disable-shared --enable-thread-safe --enable-tests-timeout=60 \
 CC="$CC" CFLAGS="-Wall -Wmissing-prototypes -O2 -g -fstack-protector \
 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security"
diff --git a/out_str.c b/out_str.c
index fd8d37f79..570dff005 100644
--- a/out_str.c
+++ b/out_str.c
@@ -1,6 +1,6 @@
 /* mpfr_out_str -- output a floating-point number to a stream
 
-Copyright 1999, 2001, 2002, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/pow.c b/pow.c
index 8d66c25dd..d9020f739 100644
--- a/pow.c
+++ b/pow.c
@@ -1,6 +1,6 @@
 /* mpfr_pow -- power function x^y
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/pow_si.c b/pow_si.c
index 76730be5a..93069057b 100644
--- a/pow_si.c
+++ b/pow_si.c
@@ -1,6 +1,6 @@
 /* mpfr_pow_si -- power function x^y with y a signed int
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/pow_ui.c b/pow_ui.c
index ef8349e2e..67894da0e 100644
--- a/pow_ui.c
+++ b/pow_ui.c
@@ -1,7 +1,7 @@
 /* mpfr_pow_ui-- compute the power of a floating-point
                                   by a machine integer
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/pow_z.c b/pow_z.c
index 249de1c61..3e88a9bf2 100644
--- a/pow_z.c
+++ b/pow_z.c
@@ -1,6 +1,6 @@
 /* mpfr_pow_z -- power function x^z with z a MPZ
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/powerof2.c b/powerof2.c
index 83676db59..48f560d95 100644
--- a/powerof2.c
+++ b/powerof2.c
@@ -1,6 +1,6 @@
 /* mpfr_powerof2_raw -- test whether a floating-point number is a power of 2
 
-Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/print_raw.c b/print_raw.c
index 2c26e7253..2038beed4 100644
--- a/print_raw.c
+++ b/print_raw.c
@@ -1,7 +1,7 @@
 /* mpfr_print_binary -- print the internal binary representation of a
                      floating-point number
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/print_rnd_mode.c b/print_rnd_mode.c
index f1cf78640..df5adea66 100644
--- a/print_rnd_mode.c
+++ b/print_rnd_mode.c
@@ -1,6 +1,6 @@
 /* mpfr_print_rnd_mode -- convert a given rounding mode to a string
 
-Copyright 1999, 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/printf.c b/printf.c
index f523373ab..c8842ad43 100644
--- a/printf.c
+++ b/printf.c
@@ -1,6 +1,6 @@
 /* mpfr_printf -- printf function and friends.
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/random.c b/random.c
index e932b47f4..ea10da142 100644
--- a/random.c
+++ b/random.c
@@ -1,6 +1,6 @@
 /* mpfr_random -- generate a random floating-point number
 
-Copyright 1999, 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/random2.c b/random2.c
index a39edb7dd..e271cd147 100644
--- a/random2.c
+++ b/random2.c
@@ -2,7 +2,7 @@
    long runs of consecutive ones and zeros in the binary representation.
    Intended for testing.
 
-Copyright 1999, 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/rec_sqrt.c b/rec_sqrt.c
index 2851cb272..da12a1de7 100644
--- a/rec_sqrt.c
+++ b/rec_sqrt.c
@@ -1,6 +1,6 @@
 /* mpfr_rec_sqrt -- inverse square root
 
-Copyright 2008 Free Software Foundation, Inc.
+Copyright 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/reldiff.c b/reldiff.c
index 6aa935440..b2a77053f 100644
--- a/reldiff.c
+++ b/reldiff.c
@@ -1,6 +1,6 @@
 /* mpfr_reldiff -- compute relative difference of two floating-point numbers.
 
-Copyright 2000, 2001, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2000, 2001, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/rem1.c b/rem1.c
index 534aafe87..c433849bd 100644
--- a/rem1.c
+++ b/rem1.c
@@ -2,7 +2,7 @@
    mpfr_fmod -- compute the floating-point remainder of x/y
    mpfr_remquo and mpfr_remainder -- argument reduction functions
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/rint.c b/rint.c
index fb6d509b1..6ca1a3b00 100644
--- a/rint.c
+++ b/rint.c
@@ -1,6 +1,6 @@
 /* mpfr_rint -- Round to an integer.
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/root.c b/root.c
index c8f14e7d5..0586b4210 100644
--- a/root.c
+++ b/root.c
@@ -1,6 +1,6 @@
 /* mpfr_root -- kth root.
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/round_near_x.c b/round_near_x.c
index ab127f152..06558fa5b 100644
--- a/round_near_x.c
+++ b/round_near_x.c
@@ -1,6 +1,6 @@
 /* mpfr_round_near_x -- Round a floating point number nears another one.
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library, and was contributed by Mathieu Dutour.
diff --git a/round_p.c b/round_p.c
index 9ec5fce56..d3c5d986b 100644
--- a/round_p.c
+++ b/round_p.c
@@ -1,6 +1,6 @@
 /* mpfr_round_p -- check if an approximation is roundable.
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/round_prec.c b/round_prec.c
index f18b8c2d1..c6fe83a11 100644
--- a/round_prec.c
+++ b/round_prec.c
@@ -1,7 +1,7 @@
 /* mpfr_round_raw_generic, mpfr_round_raw2, mpfr_round_raw, mpfr_prec_round,
    mpfr_can_round, mpfr_can_round_raw -- various rounding functions
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/round_raw_generic.c b/round_raw_generic.c
index 01c2c416a..8bd27d7d1 100644
--- a/round_raw_generic.c
+++ b/round_raw_generic.c
@@ -1,6 +1,6 @@
 /* mpfr_round_raw_generic -- Generic rounding function
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/sec.c b/sec.c
index ec82cf9d4..e8691483e 100644
--- a/sec.c
+++ b/sec.c
@@ -1,6 +1,6 @@
 /* mpfr_sec - secant function = 1/cos.
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/sech.c b/sech.c
index b34ab6b76..d1b7039b6 100644
--- a/sech.c
+++ b/sech.c
@@ -1,6 +1,6 @@
 /* mpfr_sech - Hyperbolic secant function = 1/cosh.
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/set.c b/set.c
index 095428f28..85618e4aa 100644
--- a/set.c
+++ b/set.c
@@ -1,6 +1,6 @@
 /* mpfr_set -- copy of a floating-point number
 
-Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/set_d.c b/set_d.c
index 57a48e4d6..6bb2a38ae 100644
--- a/set_d.c
+++ b/set_d.c
@@ -1,7 +1,7 @@
 /* mpfr_set_d -- convert a machine double precision float to
                  a multiple precision floating-point number
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/set_d64.c b/set_d64.c
index 73d473245..7cba51bae 100644
--- a/set_d64.c
+++ b/set_d64.c
@@ -5,7 +5,7 @@ See http://gcc.gnu.org/ml/gcc/2006-06/msg00691.html,
 http://gcc.gnu.org/onlinedocs/gcc/Decimal-Float.html,
 and TR 24732 <http://www.open-std.org/jtc1/sc22/wg14/www/projects#24732>.
 
-Copyright 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/set_dfl_prec.c b/set_dfl_prec.c
index 789360751..812c4e3b3 100644
--- a/set_dfl_prec.c
+++ b/set_dfl_prec.c
@@ -1,6 +1,6 @@
 /* mpfr_set_default_prec, mpfr_get_default_prec -- set/get default precision
 
-Copyright 1999, 2000, 2001, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/set_exp.c b/set_exp.c
index c5ae3756f..b26c348ef 100644
--- a/set_exp.c
+++ b/set_exp.c
@@ -1,6 +1,6 @@
 /* mpfr_set_exp - set the exponent of a floating-point number
 
-Copyright 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/set_f.c b/set_f.c
index 4a66fda0b..6c329d16f 100644
--- a/set_f.c
+++ b/set_f.c
@@ -1,6 +1,6 @@
 /* mpfr_set_f -- set a MPFR number from a GNU MPF number
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/set_inf.c b/set_inf.c
index 50c09e5f6..c78d8d1e8 100644
--- a/set_inf.c
+++ b/set_inf.c
@@ -1,6 +1,6 @@
 /* mpfr_set_inf -- set a number to plus or minus infinity.
 
-Copyright 2002, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2002, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/set_ld.c b/set_ld.c
index 918a30e0e..39e0eb25b 100644
--- a/set_ld.c
+++ b/set_ld.c
@@ -1,7 +1,7 @@
 /* mpfr_set_ld -- convert a machine long double to
                   a multiple precision floating-point number
 
-Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/set_nan.c b/set_nan.c
index 9cc0f1bbc..d3e97fe2a 100644
--- a/set_nan.c
+++ b/set_nan.c
@@ -1,6 +1,6 @@
 /* mpfr_set_nan -- set a number to NaN.
 
-Copyright 2002, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2002, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/set_prc_raw.c b/set_prc_raw.c
index 86d60f89d..9e6b38698 100644
--- a/set_prc_raw.c
+++ b/set_prc_raw.c
@@ -1,6 +1,6 @@
 /* mpfr_set_prec_raw -- reset the precision of a floating-point number
 
-Copyright 2000, 2001, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2000, 2001, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/set_prec.c b/set_prec.c
index e9040f21e..3ad868110 100644
--- a/set_prec.c
+++ b/set_prec.c
@@ -1,6 +1,6 @@
 /* mpfr_set_prec -- reset the precision of a floating-point number
 
-Copyright 1999, 2001, 2002, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/set_q.c b/set_q.c
index 5157464ae..3422b7c6e 100644
--- a/set_q.c
+++ b/set_q.c
@@ -1,6 +1,6 @@
 /* mpfr_set_q -- set a floating-point number from a multiple-precision rational
 
-Copyright 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/set_rnd.c b/set_rnd.c
index 72ff153e0..c760768cb 100644
--- a/set_rnd.c
+++ b/set_rnd.c
@@ -1,7 +1,7 @@
 /* mpfr_set_default_rounding_mode -- set the default rounding mode
    mpfr_get_default_rounding_mode -- get the default rounding mode
 
-Copyright 1999, 2001, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/set_si.c b/set_si.c
index a27a1d1d3..f9c6ff9af 100644
--- a/set_si.c
+++ b/set_si.c
@@ -1,6 +1,6 @@
 /* mpfr_set_si -- set a MPFR number from a machine signed integer
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/set_si_2exp.c b/set_si_2exp.c
index 448b32121..f77cfef78 100644
--- a/set_si_2exp.c
+++ b/set_si_2exp.c
@@ -1,7 +1,7 @@
 /* mpfr_set_si_2exp -- set a MPFR number from a machine signed integer with
    a shift
 
-Copyright 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/set_sj.c b/set_sj.c
index dba46a724..c24f9c78a 100644
--- a/set_sj.c
+++ b/set_sj.c
@@ -1,6 +1,6 @@
 /* mpfr_set_sj -- set a MPFR number from a huge machine signed integer
 
-Copyright 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -31,11 +31,12 @@ MA 02110-1301, USA. */
 # define __STDC_CONSTANT_MACROS
 #endif
 
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
+#if HAVE_INTTYPES_H
+# include <inttypes.h> /* for intmax_t */
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
 #endif
 
 #include "mpfr-impl.h"
diff --git a/set_str.c b/set_str.c
index a047c30a6..ff5eaace2 100644
--- a/set_str.c
+++ b/set_str.c
@@ -1,6 +1,6 @@
 /* mpfr_set_str -- set a floating-point number from a string
 
-Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/set_str_raw.c b/set_str_raw.c
index b7f9522b5..e1b3776b8 100644
--- a/set_str_raw.c
+++ b/set_str_raw.c
@@ -1,6 +1,6 @@
 /* mpfr_set_str_binary -- set a floating-point number from a binary string
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/set_ui.c b/set_ui.c
index 5362fdbb8..cc74cc7eb 100644
--- a/set_ui.c
+++ b/set_ui.c
@@ -1,6 +1,6 @@
 /* mpfr_set_ui -- set a MPFR number from a machine unsigned integer
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/set_ui_2exp.c b/set_ui_2exp.c
index 8cb9333fa..c16c9a761 100644
--- a/set_ui_2exp.c
+++ b/set_ui_2exp.c
@@ -1,7 +1,7 @@
 /* mpfr_set_ui_2exp -- set a MPFR number from a machine unsigned integer with
    a shift
 
-Copyright 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/set_uj.c b/set_uj.c
index 8542bb15e..284a343e3 100644
--- a/set_uj.c
+++ b/set_uj.c
@@ -1,6 +1,6 @@
 /* mpfr_set_uj -- set a MPFR number from a huge machine unsigned integer
 
-Copyright 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -31,11 +31,12 @@ MA 02110-1301, USA. */
 # define __STDC_CONSTANT_MACROS
 #endif
 
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
+#if HAVE_INTTYPES_H
+# include <inttypes.h> /* for intmax_t */
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
 #endif
 
 #define MPFR_NEED_LONGLONG_H
diff --git a/set_z.c b/set_z.c
index d014c7b30..683d4fa18 100644
--- a/set_z.c
+++ b/set_z.c
@@ -1,6 +1,6 @@
 /* mpfr_set_z -- set a floating-point number from a multiple-precision integer
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/setmax.c b/setmax.c
index bc30d92db..c510b609e 100644
--- a/setmax.c
+++ b/setmax.c
@@ -1,6 +1,6 @@
 /* mpfr_setmax -- maximum representable floating-point number (raw version)
 
-Copyright 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/setmin.c b/setmin.c
index 474aaeacb..5987690da 100644
--- a/setmin.c
+++ b/setmin.c
@@ -1,6 +1,6 @@
 /* mpfr_setmin -- minimum representable floating-point number (raw version)
 
-Copyright 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/setsign.c b/setsign.c
index 532b16e2f..ad6d161c1 100644
--- a/setsign.c
+++ b/setsign.c
@@ -1,6 +1,6 @@
 /* mpfr_setsign -- Produce a value with the magnitude of x and sign bit s
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/sgn.c b/sgn.c
index 41fbc7458..3489849b6 100644
--- a/sgn.c
+++ b/sgn.c
@@ -1,6 +1,6 @@
 /* mpfr_sgn -- Sign of a floating point number.
 
-Copyright 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/si_op.c b/si_op.c
index 29e0e393d..a7e80f9a1 100644
--- a/si_op.c
+++ b/si_op.c
@@ -2,7 +2,7 @@
    mpfr_sub_si -- sub  a floating-point number with a machine integer
    mpfr_si_sub -- sub  a machine number with a floating-point number
 
-Copyright 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/signbit.c b/signbit.c
index a6e0c0dd6..c406f0fe7 100644
--- a/signbit.c
+++ b/signbit.c
@@ -1,6 +1,6 @@
 /* mpfr_signbit -- Signbit of a MPFR number
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/sin.c b/sin.c
index 501360ad5..9e49e9895 100644
--- a/sin.c
+++ b/sin.c
@@ -1,6 +1,6 @@
 /* mpfr_sin -- sine of a floating-point number
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/sin_cos.c b/sin_cos.c
index 9b522029c..4ac3bef87 100644
--- a/sin_cos.c
+++ b/sin_cos.c
@@ -1,6 +1,6 @@
 /* mpfr_sin_cos -- sine and cosine of a floating-point number
 
-Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/sinh.c b/sinh.c
index 63562f293..c51ccb486 100644
--- a/sinh.c
+++ b/sinh.c
@@ -1,6 +1,6 @@
 /* mpfr_sinh -- hyperbolic sine
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/sinh_cosh.c b/sinh_cosh.c
index 573e819f9..a2c49da11 100644
--- a/sinh_cosh.c
+++ b/sinh_cosh.c
@@ -1,6 +1,6 @@
 /* mpfr_sinh_cosh -- hyperbolic sine and cosine
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/sqr.c b/sqr.c
index a4aabce1c..439cb266c 100644
--- a/sqr.c
+++ b/sqr.c
@@ -1,6 +1,6 @@
 /* mpfr_sqr -- Floating square
 
-Copyright 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/sqrt.c b/sqrt.c
index 43a2be8c9..7e320f249 100644
--- a/sqrt.c
+++ b/sqrt.c
@@ -1,6 +1,6 @@
 /* mpfr_sqrt -- square root of a floating-point number
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/sqrt_ui.c b/sqrt_ui.c
index 36e8103b2..42d1f915b 100644
--- a/sqrt_ui.c
+++ b/sqrt_ui.c
@@ -1,6 +1,6 @@
 /* mpfr_sqrt_ui -- square root of a machine integer
 
-Copyright 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/stack_interface.c b/stack_interface.c
index 3bcf4617f..02249f7a9 100644
--- a/stack_interface.c
+++ b/stack_interface.c
@@ -1,6 +1,6 @@
 /* mpfr_stack -- initialize a floating-point number with given allocation area
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/strtofr.c b/strtofr.c
index 1669de33c..cac194639 100644
--- a/strtofr.c
+++ b/strtofr.c
@@ -1,6 +1,6 @@
 /* mpfr_strtofr -- set a floating-point number from a string
 
-Copyright 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/sub.c b/sub.c
index 08a69f989..b1454ec17 100644
--- a/sub.c
+++ b/sub.c
@@ -1,6 +1,6 @@
 /* mpfr_sub -- subtract two floating-point numbers
 
-Copyright 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/sub1.c b/sub1.c
index 5d77317b0..68b5e014a 100644
--- a/sub1.c
+++ b/sub1.c
@@ -1,6 +1,6 @@
 /* mpfr_sub1 -- internal function to perform a "real" subtraction
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/sub1sp.c b/sub1sp.c
index 2927505b8..e3412df60 100644
--- a/sub1sp.c
+++ b/sub1sp.c
@@ -1,7 +1,7 @@
 /* mpfr_sub1sp -- internal function to perform a "real" substraction
    All the op must have the same precision
 
-Copyright 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/sub_d.c b/sub_d.c
index 7af216fbf..2822b4118 100644
--- a/sub_d.c
+++ b/sub_d.c
@@ -1,7 +1,7 @@
 /* mpfr_sub_d -- subtract a machine double precision float from
                  a multiple precision floating-point number
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/sub_ui.c b/sub_ui.c
index e589405a2..6b8142f64 100644
--- a/sub_ui.c
+++ b/sub_ui.c
@@ -1,6 +1,6 @@
 /* mpfr_sub_ui -- subtract a floating-point number and a machine integer
 
-Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/subnormal.c b/subnormal.c
index 94ee0ae1b..1b8bdf886 100644
--- a/subnormal.c
+++ b/subnormal.c
@@ -1,7 +1,7 @@
 /* mpfr_subnormalize -- Subnormalize a floating point number
    emulating sub-normal numbers.
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/sum.c b/sum.c
index 5c62167f1..228c14565 100644
--- a/sum.c
+++ b/sum.c
@@ -1,6 +1,6 @@
 /* Sum -- efficiently sum a list of floating-point numbers
 
-Copyright 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/swap.c b/swap.c
index c9722eefe..3cd5d69cb 100644
--- a/swap.c
+++ b/swap.c
@@ -1,6 +1,6 @@
 /* mpfr_swap (U, V) -- Swap U and V.
 
-Copyright 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tan.c b/tan.c
index 3ce8562c5..a0207ff48 100644
--- a/tan.c
+++ b/tan.c
@@ -1,6 +1,6 @@
 /* mpfr_tan -- tangent of a floating-point number
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tanh.c b/tanh.c
index cc009fc14..c22eab915 100644
--- a/tanh.c
+++ b/tanh.c
@@ -1,6 +1,6 @@
 /* mpfr_tanh -- hyperbolic tangent
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/cmp_str.c b/tests/cmp_str.c
index b75147822..a381dc45e 100644
--- a/tests/cmp_str.c
+++ b/tests/cmp_str.c
@@ -1,6 +1,6 @@
 /* mpfr_cmp_str -- compare a floating-point number with a string.
 
-Copyright 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/data/li2 b/tests/data/li2
index 80b4e39a7..3928ecfe6 100644
--- a/tests/data/li2
+++ b/tests/data/li2
@@ -1,6 +1,6 @@
 # reference values for dilogarithm function
 #
-# Copyright 2007, 2008 Free Software Foundation, Inc.
+# Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 # Contributed by the Arenaire and Cacao projects, INRIA.
 #
 # This file is part of the GNU MPFR Library.
diff --git a/tests/memory.c b/tests/memory.c
index 79d210809..bd13bded7 100644
--- a/tests/memory.c
+++ b/tests/memory.c
@@ -1,6 +1,6 @@
 /* Memory allocation used during tests.
 
-Copyright 2001, 2002, 2003, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/mpf_compat.c b/tests/mpf_compat.c
index d9ef5a559..755309380 100644
--- a/tests/mpf_compat.c
+++ b/tests/mpf_compat.c
@@ -1,6 +1,6 @@
 /* Test compatibility mpf-mpfr.
 
-Copyright 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2003, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/mpf_compat.h b/tests/mpf_compat.h
index b2721a035..6479c4c94 100644
--- a/tests/mpf_compat.h
+++ b/tests/mpf_compat.h
@@ -1,6 +1,6 @@
 /* Test compatibility mpf-mpfr.
 
-Copyright 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/mpfr-test.h b/tests/mpfr-test.h
index 8b677e3da..e2ecb6720 100644
--- a/tests/mpfr-test.h
+++ b/tests/mpfr-test.h
@@ -1,6 +1,6 @@
 /* auxiliary functions for MPFR tests.
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/mpfr_compat.c b/tests/mpfr_compat.c
index e0c73e23b..89943961b 100644
--- a/tests/mpfr_compat.c
+++ b/tests/mpfr_compat.c
@@ -1,6 +1,6 @@
 /* Test compatibility mpf-mpfr.
 
-Copyright 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2003, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/reuse.c b/tests/reuse.c
index 625f18d4c..40b0274f6 100644
--- a/tests/reuse.c
+++ b/tests/reuse.c
@@ -1,6 +1,6 @@
 /* Test file for in-place operations.
 
-Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/rnd_mode.c b/tests/rnd_mode.c
index 731609163..94442931c 100644
--- a/tests/rnd_mode.c
+++ b/tests/rnd_mode.c
@@ -1,6 +1,6 @@
 /* mpfr_set_machine_rnd_mode -- set the rounding mode for machine floats
 
-Copyright 1999, 2001, 2002, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tabs.c b/tests/tabs.c
index c58e7bf98..379cd4831 100644
--- a/tests/tabs.c
+++ b/tests/tabs.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_abs.
 
-Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tacos.c b/tests/tacos.c
index 67e2e3cdb..40c201606 100644
--- a/tests/tacos.c
+++ b/tests/tacos.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_acos.
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by Mathieu Dutour.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tacosh.c b/tests/tacosh.c
index 8149c2d3b..6b561cde4 100644
--- a/tests/tacosh.c
+++ b/tests/tacosh.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_acosh.
 
-Copyright 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tadd.c b/tests/tadd.c
index dcc6076de..03f9dcb8d 100644
--- a/tests/tadd.c
+++ b/tests/tadd.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_add and mpfr_sub.
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tadd1sp.c b/tests/tadd1sp.c
index 1b8f0cfe1..d8efe32d6 100644
--- a/tests/tadd1sp.c
+++ b/tests/tadd1sp.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_add1sp.
 
-Copyright 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -25,8 +25,8 @@ MA 02110-1301, USA. */
 
 #include "mpfr-test.h"
 
-void check_special(void);
-void check_random(mpfr_prec_t p);
+static void check_special (void);
+static void check_random (mpfr_prec_t p);
 
 static void
 check_overflow (void)
@@ -57,7 +57,8 @@ check_overflow (void)
   set_emax (emax);
 }
 
-int main(void)
+int
+main (void)
 {
   mpfr_prec_t p;
 
@@ -103,8 +104,8 @@ int main(void)
     mpfr_set_prec(b,  _p); mpfr_set_prec(c,  _p); \
   }
 
-
-void check_random(mp_prec_t p)
+static void
+check_random (mp_prec_t p)
 {
   mpfr_t a1,b,c,a2;
   int r;
@@ -136,7 +137,8 @@ void check_random(mp_prec_t p)
   mpfr_clears (a1, a2, b, c, (mpfr_ptr) 0);
 }
 
-void check_special(void)
+static void
+check_special (void)
 {
   mpfr_t a1,a2,b,c;
   int r;
diff --git a/tests/tadd_d.c b/tests/tadd_d.c
index 677d83834..131030bfd 100644
--- a/tests/tadd_d.c
+++ b/tests/tadd_d.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_add_d
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tadd_ui.c b/tests/tadd_ui.c
index d7872a646..fc1d8829c 100644
--- a/tests/tadd_ui.c
+++ b/tests/tadd_ui.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_add_ui
 
-Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tagm.c b/tests/tagm.c
index e467ad823..40139dd2e 100644
--- a/tests/tagm.c
+++ b/tests/tagm.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_agm.
 
-Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tasin.c b/tests/tasin.c
index 1dde66622..64fa08837 100644
--- a/tests/tasin.c
+++ b/tests/tasin.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_asin.
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tasinh.c b/tests/tasinh.c
index d4321c009..53c92531f 100644
--- a/tests/tasinh.c
+++ b/tests/tasinh.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_asinh.
 
-Copyright 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tatan.c b/tests/tatan.c
index b36934efe..c9d92032a 100644
--- a/tests/tatan.c
+++ b/tests/tatan.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_atan.
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tatanh.c b/tests/tatanh.c
index d6949dd39..08b271573 100644
--- a/tests/tatanh.c
+++ b/tests/tatanh.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_atanh.
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tcan_round.c b/tests/tcan_round.c
index 4119c90e1..c7e59ceb4 100644
--- a/tests/tcan_round.c
+++ b/tests/tcan_round.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_can_round.
 
-Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -49,8 +49,8 @@ check_round_p (void)
       if (r1 != r2)
         {
           printf ("mpfr_round_p(%d) != mpfr_can_round(%d)!\n"
-                  "bn = %ld, err0 = %ld, prec = %ld\nbp = ",
-                  r1, r2, n, err, p);
+                  "bn = %ld, err0 = %ld, prec = %lu\nbp = ",
+                  r1, r2, n, err, (unsigned long) p);
           gmp_printf ("%NX\n", buf, n);
           exit (1);
         }
diff --git a/tests/tcbrt.c b/tests/tcbrt.c
index 886dfe625..967202cb3 100644
--- a/tests/tcbrt.c
+++ b/tests/tcbrt.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_cbrt.
 
-Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tcheck.c b/tests/tcheck.c
index 9a9c87b09..58948a416 100644
--- a/tests/tcheck.c
+++ b/tests/tcheck.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_check.
 
-Copyright 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tcmp.c b/tests/tcmp.c
index f073d327a..02e263bb6 100644
--- a/tests/tcmp.c
+++ b/tests/tcmp.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_cmp.
 
-Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tcmp2.c b/tests/tcmp2.c
index 688d5d65d..e96ccbd67 100644
--- a/tests/tcmp2.c
+++ b/tests/tcmp2.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_cmp2.
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -69,7 +69,7 @@ worst_cases (void)
           mpfr_out_str (stdout, 2, 0, x, GMP_RNDN);
           printf ("\ny=");
           mpfr_out_str (stdout, 2, 0, y, GMP_RNDN);
-          printf ("\ngot %lu instead of %u\n", l, 1);
+          printf ("\ngot %lu instead of 1\n", l);
           exit (1);
         }
 
@@ -81,7 +81,7 @@ worst_cases (void)
           mpfr_out_str (stdout, 2, 0, x, GMP_RNDN);
           printf ("\ny=");
           mpfr_out_str (stdout, 2, 0, y, GMP_RNDN);
-          printf ("\ngot %lu instead of %u\n", l, 0);
+          printf ("\ngot %lu instead of 0\n", l);
           exit (1);
         }
     }
diff --git a/tests/tcmp_d.c b/tests/tcmp_d.c
index 5cef0e82a..1fc00c54e 100644
--- a/tests/tcmp_d.c
+++ b/tests/tcmp_d.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_cmp_d.
 
-Copyright 1999, 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -74,6 +74,11 @@ main (void)
   if (c != 0 || !mpfr_erangeflag_p ())
     {
       printf ("ERROR for NAN (1)\n");
+#ifdef MPFR_NANISNAN
+      printf ("The reason is that NAN == NAN. Please look at the configure "
+              "output\nand Section \"In case of problem\" of the INSTALL "
+              "file.\n");
+#endif
       exit (1);
     }
   mpfr_set_nan (x);
@@ -82,6 +87,11 @@ main (void)
   if (c != 0 || !mpfr_erangeflag_p ())
     {
       printf ("ERROR for NAN (2)\n");
+#ifdef MPFR_NANISNAN
+      printf ("The reason is that NAN == NAN. Please look at the configure "
+              "output\nand Section \"In case of problem\" of the INSTALL "
+              "file.\n");
+#endif
       exit (1);
     }
 
diff --git a/tests/tcmp_ld.c b/tests/tcmp_ld.c
index c8d654f2d..6f63ca8b9 100644
--- a/tests/tcmp_ld.c
+++ b/tests/tcmp_ld.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_cmp_ld.
 
-Copyright 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -73,6 +73,11 @@ main (void)
   if (c != 0 || !mpfr_erangeflag_p ())
     {
       printf ("ERROR for NAN (1)\n");
+#ifdef MPFR_NANISNAN
+      printf ("The reason is that NAN == NAN. Please look at the configure "
+              "output\nand Section \"In case of problem\" of the INSTALL "
+              "file.\n");
+#endif
       exit (1);
     }
   mpfr_set_nan (x);
@@ -81,10 +86,14 @@ main (void)
   if (c != 0 || !mpfr_erangeflag_p ())
     {
       printf ("ERROR for NAN (2)\n");
+#ifdef MPFR_NANISNAN
+      printf ("The reason is that NAN == NAN. Please look at the configure "
+              "output\nand Section \"In case of problem\" of the INSTALL "
+              "file.\n");
+#endif
       exit (1);
     }
 
-
   mpfr_clear(x);
 
   tests_end_mpfr ();
diff --git a/tests/tcmp_ui.c b/tests/tcmp_ui.c
index 65794c4aa..df3bafc24 100644
--- a/tests/tcmp_ui.c
+++ b/tests/tcmp_ui.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_cmp_ui and mpfr_cmp_si.
 
-Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tcmpabs.c b/tests/tcmpabs.c
index 98dd1d8b0..1e14c90c4 100644
--- a/tests/tcmpabs.c
+++ b/tests/tcmpabs.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_cmpabs.
 
-Copyright 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tcomparisons.c b/tests/tcomparisons.c
index 825d2fca7..cb71a7f6f 100644
--- a/tests/tcomparisons.c
+++ b/tests/tcomparisons.c
@@ -2,7 +2,7 @@
    mpfr_lessequal_p, mpfr_lessgreater_p, mpfr_equal_p, mpfr_unordered_p
    functions.
 
-Copyright 2003, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2003, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tconst_catalan.c b/tests/tconst_catalan.c
index 0911b1fcc..91c22f4c9 100644
--- a/tests/tconst_catalan.c
+++ b/tests/tconst_catalan.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_const_catalan.
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tconst_euler.c b/tests/tconst_euler.c
index 836304c91..4952cab26 100644
--- a/tests/tconst_euler.c
+++ b/tests/tconst_euler.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_const_euler.
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tconst_log2.c b/tests/tconst_log2.c
index 00a5af4db..a48614cb9 100644
--- a/tests/tconst_log2.c
+++ b/tests/tconst_log2.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_const_log2.
 
-Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -90,7 +90,7 @@ check_large (void)
 }
 
 static void
-check_cache ()
+check_cache (void)
 {
   mpfr_t x;
   int i;
diff --git a/tests/tconst_pi.c b/tests/tconst_pi.c
index cebb094ee..1e18db1c8 100644
--- a/tests/tconst_pi.c
+++ b/tests/tconst_pi.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_const_pi.
 
-Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tcopysign.c b/tests/tcopysign.c
index fd33308dc..55185d1f7 100644
--- a/tests/tcopysign.c
+++ b/tests/tcopysign.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_copysign, mpfr_setsign and mpfr_signbit.
 
-Copyright 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tcos.c b/tests/tcos.c
index 208c8e81d..32ad3ebc4 100644
--- a/tests/tcos.c
+++ b/tests/tcos.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_cos.
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tcosh.c b/tests/tcosh.c
index 8aae3cfa1..89e51930a 100644
--- a/tests/tcosh.c
+++ b/tests/tcosh.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_cosh.
 
-Copyright 2001, 2002, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tcot.c b/tests/tcot.c
index 99214e20f..2d44300c9 100644
--- a/tests/tcot.c
+++ b/tests/tcot.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_cot.
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tcoth.c b/tests/tcoth.c
index 05924cfbc..fd6ad6799 100644
--- a/tests/tcoth.c
+++ b/tests/tcoth.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_coth.
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tcsc.c b/tests/tcsc.c
index 1c37e6ecc..3adcb507f 100644
--- a/tests/tcsc.c
+++ b/tests/tcsc.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_csc.
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tcsch.c b/tests/tcsch.c
index cc3e0ef13..c46e24cec 100644
--- a/tests/tcsch.c
+++ b/tests/tcsch.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_csch.
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/td_div.c b/tests/td_div.c
index 9a7e9e97d..8e30bd159 100644
--- a/tests/td_div.c
+++ b/tests/td_div.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_d_div
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/td_sub.c b/tests/td_sub.c
index a3a277f72..4e47ad34e 100644
--- a/tests/td_sub.c
+++ b/tests/td_sub.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_d_sub
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tdim.c b/tests/tdim.c
index cedc060b9..d1d23dd10 100644
--- a/tests/tdim.c
+++ b/tests/tdim.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_dim.
 
-Copyright 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tdiv.c b/tests/tdiv.c
index ff1f19c1e..159ca5f14 100644
--- a/tests/tdiv.c
+++ b/tests/tdiv.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_div.
 
-Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tdiv_d.c b/tests/tdiv_d.c
index 2c09f63bb..ca22d2632 100644
--- a/tests/tdiv_d.c
+++ b/tests/tdiv_d.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_div_d
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tdiv_ui.c b/tests/tdiv_ui.c
index cf56bf426..80f0e3961 100644
--- a/tests/tdiv_ui.c
+++ b/tests/tdiv_ui.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_div_ui.
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/teint.c b/tests/teint.c
index 2f4a0551a..d593253ba 100644
--- a/tests/teint.c
+++ b/tests/teint.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_eint.
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/teq.c b/tests/teq.c
index 220dbdec2..b47a84804 100644
--- a/tests/teq.c
+++ b/tests/teq.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_eq.
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -47,7 +47,7 @@ teq (mpfr_t x)
           printf ("Error in eq.\n");
           printf ("x = "); mpfr_print_binary (x); printf ("\n");
           printf ("y = "); mpfr_print_binary (y); printf ("\n");
-          printf ("k = %ld\n", k);
+          printf ("k = %lu\n", k);
           printf ("mpfr_eq(y, x, k) = %d\nmpfr_eq(y, x, k - 1) = %d\n",
                   mpfr_eq (y, x, k), mpfr_eq (y, x, k - 1));
           exit (1);
diff --git a/tests/terf.c b/tests/terf.c
index 919c16b38..4143e5756 100644
--- a/tests/terf.c
+++ b/tests/terf.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_erf and mpfr_erfc.
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by Ludovic Meunier and Paul Zimmermann.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tests.c b/tests/tests.c
index fcfa3d8c7..5906e0682 100644
--- a/tests/tests.c
+++ b/tests/tests.c
@@ -1,6 +1,6 @@
 /* Miscellaneous support for test programs.
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -45,7 +45,9 @@ MA 02110-1301, USA. */
 #  include <time.h>
 #endif
 
-#ifdef HAVE_SYS_FPU_H
+/* <sys/fpu.h> is needed to have union fpc_csr defined under IRIX64
+   (see below). Let's include it only if need be. */
+#if defined HAVE_SYS_FPU_H && defined HAVE_FPC_CSR
 # include <sys/fpu.h>
 #endif
 
@@ -275,7 +277,7 @@ tests_rand_end (void)
 /* initialization function for tests using the hardware floats
    Not very useful now. */
 void
-mpfr_test_init ()
+mpfr_test_init (void)
 {
   double d;
 #ifdef HAVE_FPC_CSR
@@ -373,6 +375,7 @@ dbl (double m, int e)
   return m;
 }
 
+/* Warning: NaN values cannot be distinguished if MPFR_NANISNAN is defined. */
 int
 Isnan (double d)
 {
@@ -529,8 +532,9 @@ test4rm (int (*fct) (FLIST), mpfr_srcptr x, mpfr_ptr y, mpfr_ptr z,
       fct (z, x, rnd);
       if (! mpfr_equal_p (y, z))
         {
-          printf ("Error for %s with xprec=%ld, yprec=%ld, rnd=%s\nx = ",
-                  name, MPFR_PREC (x), yprec, mpfr_print_rnd_mode (rnd));
+          printf ("Error for %s with xprec=%lu, yprec=%lu, rnd=%s\nx = ",
+                  name, (unsigned long) MPFR_PREC (x), (unsigned long) yprec,
+                  mpfr_print_rnd_mode (rnd));
           mpfr_out_str (stdout, 16, 0, x, GMP_RNDN);
           printf ("\nexpected ");
           mpfr_out_str (stdout, 16, 0, y, GMP_RNDN);
diff --git a/tests/texceptions.c b/tests/texceptions.c
index bbaf0b4b0..b31b47a15 100644
--- a/tests/texceptions.c
+++ b/tests/texceptions.c
@@ -1,6 +1,6 @@
 /* Test file for exceptions.
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/texp.c b/tests/texp.c
index fdb45dd61..47d2c93b2 100644
--- a/tests/texp.c
+++ b/tests/texp.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_exp.
 
-Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -219,7 +219,7 @@ check_large (void)
 #include "tgeneric.c"
 
 static void
-check_special ()
+check_special (void)
 {
   mpfr_t x, y, z;
   mp_exp_t emin, emax;
@@ -712,7 +712,7 @@ underflow_up (int extended_emin)
                       printf ("\nfor precx = %d, precy = %d, %s\n",
                               precx, precy, e3 ? "mpfr_exp_3" : "mpfr_exp");
                       printf ("Got %u instead of %u.\n", __gmpfr_flags,
-                              MPFR_FLAGS_INEXACT);
+                              (unsigned int) MPFR_FLAGS_INEXACT);
                       err = 1;
                     }
                   if (mpfr_cmp0 (y, minpos) < 0)
diff --git a/tests/texp10.c b/tests/texp10.c
index 134f84816..bc9f231c4 100644
--- a/tests/texp10.c
+++ b/tests/texp10.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_exp10.
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/texp2.c b/tests/texp2.c
index 56acdd95e..f3c569c79 100644
--- a/tests/texp2.c
+++ b/tests/texp2.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_exp2.
 
-Copyright 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/texpm1.c b/tests/texpm1.c
index 432317b00..efffcc126 100644
--- a/tests/texpm1.c
+++ b/tests/texpm1.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_expm1.
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tfactorial.c b/tests/tfactorial.c
index 89daa36b3..f7a38c713 100644
--- a/tests/tfactorial.c
+++ b/tests/tfactorial.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_factorial.
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tfits.c b/tests/tfits.c
index d4aac8afe..a7cd02508 100644
--- a/tests/tfits.c
+++ b/tests/tfits.c
@@ -2,7 +2,7 @@
  mpfr_fits_sint_p, mpfr_fits_slong_p, mpfr_fits_sshort_p,
  mpfr_fits_uint_p, mpfr_fits_ulong_p, mpfr_fits_ushort_p
 
-Copyright 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -37,11 +37,12 @@ MA 02110-1301, USA. */
 # define __STDC_CONSTANT_MACROS
 #endif
 
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
+#if HAVE_INTTYPES_H
+# include <inttypes.h> /* for intmax_t */
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
 #endif
 
 #include "mpfr-test.h"
diff --git a/tests/tfma.c b/tests/tfma.c
index 7caa18ff6..a8d389214 100644
--- a/tests/tfma.c
+++ b/tests/tfma.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_fma.
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tfmod.c b/tests/tfmod.c
index 4facfa2d5..af5f159f9 100644
--- a/tests/tfmod.c
+++ b/tests/tfmod.c
@@ -1,6 +1,6 @@
 /* tfmod -- test file for mpfr_fmod
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tfms.c b/tests/tfms.c
index 86026c971..7bfd3145f 100644
--- a/tests/tfms.c
+++ b/tests/tfms.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_fms.
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tfprintf.c b/tests/tfprintf.c
index ee31d7c28..981799bca 100644
--- a/tests/tfprintf.c
+++ b/tests/tfprintf.c
@@ -1,6 +1,6 @@
 /* tfprintf.c -- test file for mpfr_fprintf and mpfr_vfprintf
 
-Copyright 2008 Free Software Foundation, Inc.
+Copyright 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 The GNU MPFR Library is free software; you can redistribute it and/or modify
@@ -26,12 +26,12 @@ MA 02110-1301, USA. */
 #include <float.h>
 #include <stddef.h>
 
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-
-#ifdef HAVE_QUAD_T
-#include <sys/types.h>
+#if HAVE_INTTYPES_H
+# include <inttypes.h> /* for intmax_t */
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
 #endif
 
 #include "mpfr-test.h"
@@ -140,7 +140,7 @@ check_special (FILE *fout)
 static void
 check_mixed (FILE *fout)
 {
-  char ch = 'a';
+  int ch = 'a';
   signed char sch = -1;
   unsigned char uch = 1;
   short sh = -1;
@@ -187,26 +187,35 @@ check_mixed (FILE *fout)
   check_length (2, ulo, 37, lu);
   check_vfprintf (fout, "a. %hi, b. %*f, c. %Re%hn", ush, 3, f, mpfr, &ush);
   check_length (3, ush, 29, hu);
-  check_vfprintf (fout, "a. %hi, b. %e, c. %#.2Rf%n", sh, d, mpfr, &i);
-  check_length (4, i, 33, d);
+  check_vfprintf (fout, "a. %hi, b. %f, c. %#.2Rf%n", sh, d, mpfr, &i);
+  check_length (4, i, 29, d);
   check_vfprintf (fout, "a. %R*A, b. %Fe, c. %i%zn", rnd, mpfr, mpf, sz,
                   &sz);
   check_length (5, sz, 34, zu);
-  check_vfprintf (fout, "a. %Pu, b. %c, c. %Lf, d. %Zi%Zn", prec, ch, ld,
-                  mpz, &mpz);
-  check_length_with_cmp (6, mpz, 31, mpz_cmp_ui (mpz, 31), Zi);
-  check_vfprintf (fout, "%% a. %#.0RNg, b. %Qx%Rn, c. %td, d. %p", mpfr, mpq,
-                  &mpfr, p, &i);
+  check_vfprintf (fout, "a. %Pu, b. %c, c. %Zi%Zn", prec, ch, mpz, &mpz);
+  check_length_with_cmp (6, mpz, 17, mpz_cmp_ui (mpz, 17), Zi);
+  check_vfprintf (fout, "%% a. %#.0RNg, b. %Qx%Rn, c. %p", mpfr, mpq, &mpfr,
+                  &i);
   check_length_with_cmp (7, mpfr, 16, mpfr_cmp_ui (mpfr, 16), Rg);
 
+#ifndef NPRINTF_T
+  check_vfprintf (fout, "%% a. %RNg, b. %Qx, c. %td%tn", mpfr, mpq, p, &p);
+  check_length (8, p, 21, td);
+#endif
+
+#ifndef NPRINTF_L
+  check_vfprintf (fout, "a. %RA, b. %Lf, c. %QX%zn", mpfr, ld, mpq, &sz);
+  check_length (9, sz, 30, zu);
+#endif
+
 #if (__GNU_MP_VERSION * 10 + __GNU_MP_VERSION_MINOR) >= 42
   /* The 'M' specifier was added in gmp 4.2.0 */
   check_vfprintf (fout, "a. %Mx b. %Re%Mn", limb[0], mpfr, &limb[0]);
   if (limb[0] != 14 + BITS_PER_MP_LIMB / 4 || limb[1] != ~ (mp_limb_t) 0
       || limb[2] != ~ (mp_limb_t) 0)
     {
-      printf ("Error in test #8: mpfr_vfprintf did not print %u characters"
-              " as expected\n", 14 + BITS_PER_MP_LIMB / 4);
+      printf ("Error in test #10: mpfr_vfprintf did not print %d characters"
+              " as expected\n", 14 + (int) BITS_PER_MP_LIMB / 4);
       exit (1);
     }
 
@@ -218,8 +227,8 @@ check_mixed (FILE *fout)
   if (limb[0] != 14 + 3 * BITS_PER_MP_LIMB / 4 || limb[1] != (mp_limb_t) 0
       || limb[2] != ~ (mp_limb_t) 0)
     {
-      printf ("Error in test #9: mpfr_vfprintf did not print %u characters"
-              " as expected\n", 14 + BITS_PER_MP_LIMB / 4);
+      printf ("Error in test #11: mpfr_vfprintf did not print %d characters"
+              " as expected\n", 14 + (int) BITS_PER_MP_LIMB / 4);
       exit (1);
     }
 #endif
@@ -230,25 +239,13 @@ check_mixed (FILE *fout)
     unsigned long long ullo = 1;
 
     check_vfprintf (fout, "a. %Re, b. %llx%Qn", mpfr, ullo, &mpq);
-    check_length_with_cmp (11, mpq, 16, mpq_cmp_ui (mpq, 16, 1), Qu);
-    check_vfprintf (fout, "a. %lli, b. %Rf%Fn", llo, mpfr, &mpf);
-    check_length_with_cmp (12, mpf, 12, mpf_cmp_ui (mpf, 12), Fg);
-  }
-#endif
-
-#ifdef HAVE_QUAD_T
-  {
-    quad_t q = -1;
-    u_quad_t uq = 1;
-
-    check_vfprintf (fout, "a. %Re, b. %qx%Qn", mpfr, uq, &mpq);
     check_length_with_cmp (21, mpq, 16, mpq_cmp_ui (mpq, 16, 1), Qu);
-    check_vfprintf (fout, "a. %qi, b. %Rf%Fn", q, mpfr, &mpf);
+    check_vfprintf (fout, "a. %lli, b. %Rf%Fn", llo, mpfr, &mpf);
     check_length_with_cmp (22, mpf, 12, mpf_cmp_ui (mpf, 12), Fg);
   }
 #endif
 
-#ifdef _MPFR_H_HAVE_INTMAX_T
+#if defined(_MPFR_H_HAVE_INTMAX_T) && !defined(NPRINTF_J)
   {
     intmax_t im = -1;
     uintmax_t uim = 1;
diff --git a/tests/tfrac.c b/tests/tfrac.c
index d73d09d6a..a0d7e9f2f 100644
--- a/tests/tfrac.c
+++ b/tests/tfrac.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_frac.
 
-Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tgamma.c b/tests/tgamma.c
index edd1c9904..436f67ba0 100644
--- a/tests/tgamma.c
+++ b/tests/tgamma.c
@@ -1,6 +1,6 @@
 /* mpfr_tgamma -- test file for gamma function
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library, and was contributed by Mathieu Dutour.
@@ -424,7 +424,7 @@ gamma_integer (void)
       mpfr_set_z (x, n, GMP_RNDN);
       if (!mpfr_equal_p (x, y))
         {
-          printf ("Error for gamma(%d)\n", i+1);
+          printf ("Error for gamma(%u)\n", i+1);
           printf ("expected "); mpfr_dump (x);
           printf ("got      "); mpfr_dump (y);
           exit (1);
diff --git a/tests/tgeneric.c b/tests/tgeneric.c
index 0678ffa56..36fe72d6b 100644
--- a/tests/tgeneric.c
+++ b/tests/tgeneric.c
@@ -1,7 +1,7 @@
 /* Generic test file for functions with one or two arguments (the second being
    either mpfr_t or double).
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tgeneric_ui.c b/tests/tgeneric_ui.c
index da84bc52c..f57b82baf 100644
--- a/tests/tgeneric_ui.c
+++ b/tests/tgeneric_ui.c
@@ -1,6 +1,6 @@
 /* Generic test file for functions with one mpfr_t argument and an integer.
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tget_d.c b/tests/tget_d.c
index 9c611f75e..f19929ffb 100644
--- a/tests/tget_d.c
+++ b/tests/tget_d.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_get_d
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -27,7 +27,7 @@ MA 02110-1301, USA. */
 #include "mpfr-test.h"
 
 static int
-check_denorms ()
+check_denorms (void)
 {
   mp_rnd_t rnd_mode;
   mpfr_t x;
@@ -70,7 +70,7 @@ check_denorms ()
 }
 
 static void
-check_inf_nan ()
+check_inf_nan (void)
 {
   /* only if nans and infs are available */
 #if _GMP_IEEE_FLOATS
diff --git a/tests/tget_d_2exp.c b/tests/tget_d_2exp.c
index fa41a8eed..8f107aa9a 100644
--- a/tests/tget_d_2exp.c
+++ b/tests/tget_d_2exp.c
@@ -1,6 +1,6 @@
 /* Test mpfr_get_d_2exp.
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -78,7 +78,7 @@ check_round (void)
 
 
 static void
-check_inf_nan ()
+check_inf_nan (void)
 {
   /* only if nans and infs are available */
 #if _GMP_IEEE_FLOATS
diff --git a/tests/tget_f.c b/tests/tget_f.c
index 830529e87..bce29e870 100644
--- a/tests/tget_f.c
+++ b/tests/tget_f.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_get_f.
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tget_ld_2exp.c b/tests/tget_ld_2exp.c
index d4ac9f6a8..d7ef40af0 100644
--- a/tests/tget_ld_2exp.c
+++ b/tests/tget_ld_2exp.c
@@ -1,6 +1,6 @@
 /* Test mpfr_get_ld_2exp.
 
-Copyright 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -78,7 +78,7 @@ check_round (void)
 
 
 static void
-check_inf_nan ()
+check_inf_nan (void)
 {
   /* only if nans and infs are available */
 #if _GMP_IEEE_FLOATS
diff --git a/tests/tget_set_d64.c b/tests/tget_set_d64.c
index e08712d34..97784f469 100644
--- a/tests/tget_set_d64.c
+++ b/tests/tget_set_d64.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_get_decimal64 and mpfr_set_decimal64.
 
-Copyright 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -49,7 +49,7 @@ print_decimal64 (_Decimal64 d)
 }
 
 static void
-check_inf_nan ()
+check_inf_nan (void)
 {
   mpfr_t  x, y;
   _Decimal64 d;
diff --git a/tests/tget_sj.c b/tests/tget_sj.c
index 827f046b8..51c293f1d 100644
--- a/tests/tget_sj.c
+++ b/tests/tget_sj.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_get_sj and mpfr_get_uj.
 
-Copyright 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tget_str.c b/tests/tget_str.c
index 267826082..8b4529197 100644
--- a/tests/tget_str.c
+++ b/tests/tget_str.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_get_str.
 
-Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tget_z.c b/tests/tget_z.c
index fc6600b82..5dedf4261 100644
--- a/tests/tget_z.c
+++ b/tests/tget_z.c
@@ -1,6 +1,6 @@
 /* Test file for mpz_set_fr / mpfr_get_z.
 
-Copyright 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tgmpop.c b/tests/tgmpop.c
index 67eecd0dd..904be8294 100644
--- a/tests/tgmpop.c
+++ b/tests/tgmpop.c
@@ -1,7 +1,7 @@
 /* Test file for mpfr_add_[q,z], mpfr_sub_[q,z], mpfr_div_[q,z], mpfr_mul_[q,z]
    and mpfr_cmp_[q,z]
 
-Copyright 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -127,7 +127,7 @@ special (void)
 }
 
 static void
-check_for_zero ()
+check_for_zero (void)
 {
   /* Check that 0 is unsigned! */
   mpq_t q;
diff --git a/tests/thyperbolic.c b/tests/thyperbolic.c
index 963d64d06..0b4a3fb0b 100644
--- a/tests/thyperbolic.c
+++ b/tests/thyperbolic.c
@@ -1,6 +1,6 @@
 /* Test file for hyperbolic function : mpfr_cosh, mpfr_sinh, mpfr_tanh, mpfr_acosh, mpfr_asinh, mpfr_atanh.
 
-Copyright 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/thypot.c b/tests/thypot.c
index d8939c1ae..d4e7baf0f 100644
--- a/tests/thypot.c
+++ b/tests/thypot.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_hypot.
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tinits.c b/tests/tinits.c
index 1b7a5a140..960d7e539 100644
--- a/tests/tinits.c
+++ b/tests/tinits.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_inits, mpfr_inits2 and mpfr_clears.
 
-Copyright 2003, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2003, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tinp_str.c b/tests/tinp_str.c
index aea61f5d9..6860c3674 100644
--- a/tests/tinp_str.c
+++ b/tests/tinp_str.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_inp_str.
 
-Copyright 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tinternals.c b/tests/tinternals.c
index 57c2c0ee5..f055ad45d 100644
--- a/tests/tinternals.c
+++ b/tests/tinternals.c
@@ -1,6 +1,6 @@
 /* tinternals -- Test for internals.
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tisnan.c b/tests/tisnan.c
index d14c5ba5b..378b31b48 100644
--- a/tests/tisnan.c
+++ b/tests/tisnan.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_nan_p, mpfr_inf_p and mpfr_number_p.
 
-Copyright 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tisqrt.c b/tests/tisqrt.c
index 506088913..a21153358 100644
--- a/tests/tisqrt.c
+++ b/tests/tisqrt.c
@@ -1,6 +1,6 @@
 /* Test file for __gmpfr_isqrt and __gmpfr_cuberoot internal functions.
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tj0.c b/tests/tj0.c
index 4de7e7bc6..dc8fe1e53 100644
--- a/tests/tj0.c
+++ b/tests/tj0.c
@@ -1,6 +1,6 @@
 /* tj0 -- test file for the Bessel function of first kind (order 0)
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tj1.c b/tests/tj1.c
index 00be4f77b..e8b6fa927 100644
--- a/tests/tj1.c
+++ b/tests/tj1.c
@@ -1,6 +1,6 @@
 /* tj1 -- test file for the Bessel function of first kind (order 1)
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tjn.c b/tests/tjn.c
index ecfac0d47..88b5ab8f1 100644
--- a/tests/tjn.c
+++ b/tests/tjn.c
@@ -1,6 +1,6 @@
 /* tjn -- test file for the Bessel function of first kind
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tl2b.c b/tests/tl2b.c
index b8535e594..c0276919d 100644
--- a/tests/tl2b.c
+++ b/tests/tl2b.c
@@ -1,6 +1,6 @@
 /* Test file for l2b constants.
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tlgamma.c b/tests/tlgamma.c
index 8f2168aff..347dd386a 100644
--- a/tests/tlgamma.c
+++ b/tests/tlgamma.c
@@ -1,6 +1,6 @@
 /* mpfr_tlgamma -- test file for lgamma function
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tli2.c b/tests/tli2.c
index 00f9deebb..2a588798a 100644
--- a/tests/tli2.c
+++ b/tests/tli2.c
@@ -1,6 +1,6 @@
 /* mpfr_tli2 -- test file for dilogarithm function
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 The GNU MPFR Library is free software; you can redistribute it and/or modify
diff --git a/tests/tlngamma.c b/tests/tlngamma.c
index 8257af023..ef3eb2d82 100644
--- a/tests/tlngamma.c
+++ b/tests/tlngamma.c
@@ -1,6 +1,6 @@
 /* mpfr_tlngamma -- test file for lngamma function
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tlog.c b/tests/tlog.c
index c22410d68..fe46ea310 100644
--- a/tests/tlog.c
+++ b/tests/tlog.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_log.
 
-Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tlog10.c b/tests/tlog10.c
index d26ceff95..8dc69aa4a 100644
--- a/tests/tlog10.c
+++ b/tests/tlog10.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_log10.
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tlog1p.c b/tests/tlog1p.c
index c76755ef7..27f42cc8e 100644
--- a/tests/tlog1p.c
+++ b/tests/tlog1p.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_log1p.
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tlog2.c b/tests/tlog2.c
index 5c7c53f2c..1c634b523 100644
--- a/tests/tlog2.c
+++ b/tests/tlog2.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_log2.
 
-Copyright 2001, 2002, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tminmax.c b/tests/tminmax.c
index 3ba63c9ec..6eadbea6a 100644
--- a/tests/tminmax.c
+++ b/tests/tminmax.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_min & mpfr_max.
 
-Copyright 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tmodf.c b/tests/tmodf.c
index b1d05f5ba..79aa7b1e6 100644
--- a/tests/tmodf.c
+++ b/tests/tmodf.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_modf.
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tmul.c b/tests/tmul.c
index ebf7151e2..b7f73ad4e 100644
--- a/tests/tmul.c
+++ b/tests/tmul.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_mul.
 
-Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tmul_2exp.c b/tests/tmul_2exp.c
index 973bda015..e802ac24b 100644
--- a/tests/tmul_2exp.c
+++ b/tests/tmul_2exp.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_{mul,div}_2{ui,si}.
 
-Copyright 1999, 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tmul_d.c b/tests/tmul_d.c
index d168c92cf..b07b61174 100644
--- a/tests/tmul_d.c
+++ b/tests/tmul_d.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_mul_d
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tmul_ui.c b/tests/tmul_ui.c
index 023ee7870..a102b7d67 100644
--- a/tests/tmul_ui.c
+++ b/tests/tmul_ui.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_mul_ui.
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tnext.c b/tests/tnext.c
index e80946862..3a09e7d58 100644
--- a/tests/tnext.c
+++ b/tests/tnext.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_nextabove, mpfr_nextbelow, mpfr_nexttoward.
 
-Copyright 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tout_str.c b/tests/tout_str.c
index dda85c1b4..5c587fa98 100644
--- a/tests/tout_str.c
+++ b/tests/tout_str.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_out_str.
 
-Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/toutimpl.c b/tests/toutimpl.c
index 46c73f731..5b035fca2 100644
--- a/tests/toutimpl.c
+++ b/tests/toutimpl.c
@@ -1,7 +1,7 @@
 /* Test file for internal debugging-out functions:
    mpfr_dump, mpfr_print_binary, mpfr_print_rnd_mode.
 
-Copyright 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -37,7 +37,8 @@ static const char Buffer[] =
 "-0\n"
 "0.10101010101011111001000110001100010000100000000000000E32\n";
 
-int main()
+int
+main (void)
 {
   mpfr_t x;
   FILE *f;
diff --git a/tests/tpow.c b/tests/tpow.c
index 4bbf45814..7e05c3362 100644
--- a/tests/tpow.c
+++ b/tests/tpow.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_pow, mpfr_pow_ui and mpfr_pow_si.
 
-Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -347,7 +347,7 @@ check_pow_si (void)
 }
 
 static void
-check_special_pow_si ()
+check_special_pow_si (void)
 {
   mpfr_t a, b;
   mp_exp_t emin;
@@ -475,7 +475,7 @@ check_inexact (mp_prec_t p)
 }
 
 static void
-special ()
+special (void)
 {
   mpfr_t x, y, z, t;
   mp_exp_t emin, emax;
@@ -1288,7 +1288,8 @@ bug20080721 (void)
                   mpfr_print_rnd_mode ((mp_rnd_t) rnd));
           printf ("expected ");
           mpfr_out_str (stdout, 2, 0, t[i], GMP_RNDN);
-          printf (", inex = %d, flags = %u\n", inex0, MPFR_FLAGS_INEXACT);
+          printf (", inex = %d, flags = %u\n", inex0,
+                  (unsigned int) MPFR_FLAGS_INEXACT);
           printf ("got      ");
           mpfr_out_str (stdout, 2, 0, z, GMP_RNDN);
           printf (", inex = %d, flags = %u\n", inex, flags);
diff --git a/tests/tpow3.c b/tests/tpow3.c
index a03d4adab..5b02fba43 100644
--- a/tests/tpow3.c
+++ b/tests/tpow3.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_pow.
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tpow_all.c b/tests/tpow_all.c
index 7287cc2ed..181671bd7 100644
--- a/tests/tpow_all.c
+++ b/tests/tpow_all.c
@@ -1,6 +1,6 @@
 /* Test file for the various power functions
 
-Copyright 2008 Free Software Foundation, Inc.
+Copyright 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tpow_z.c b/tests/tpow_z.c
index 6e34bde3f..c50678291 100644
--- a/tests/tpow_z.c
+++ b/tests/tpow_z.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_pow_z -- power function x^z with z a MPZ
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -171,7 +171,7 @@ check_integer (mp_prec_t begin, mp_prec_t end, unsigned long max)
               res2 = mpfr_pow_z  (y2, x, z, rnd);
               if (mpfr_cmp (y1, y2) != 0)
                 {
-                  printf ("Error for p = %lu, z = %ld, rnd = %s and x = ",
+                  printf ("Error for p = %lu, z = %lu, rnd = %s and x = ",
                           p, n, mpfr_print_rnd_mode (rnd));
                   mpfr_dump (x);
                   printf ("Ypowsi = "); mpfr_dump (y1);
@@ -180,7 +180,7 @@ check_integer (mp_prec_t begin, mp_prec_t end, unsigned long max)
                 }
               if (res1 != res2)
                 {
-                  printf ("Wrong inexact flags for p = %lu, z = %ld, rnd = %s"
+                  printf ("Wrong inexact flags for p = %lu, z = %lu, rnd = %s"
                           " and x = ", p, n, mpfr_print_rnd_mode (rnd));
                   mpfr_dump (x);
                   printf ("Ypowsi(inex = %2d) = ", res1); mpfr_dump (y1);
diff --git a/tests/tprintf.c b/tests/tprintf.c
index 849810e35..70c612888 100644
--- a/tests/tprintf.c
+++ b/tests/tprintf.c
@@ -1,6 +1,6 @@
 /* tprintf.c -- test file for mpfr_printf and mpfr_vprintf
 
-Copyright 2008 Free Software Foundation, Inc.
+Copyright 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 The GNU MPFR Library is free software; you can redistribute it and/or modify
@@ -25,12 +25,12 @@ MA 02110-1301, USA. */
 #include <stdlib.h>
 #include <stddef.h>
 
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-
-#ifdef HAVE_QUAD_T
-#include <sys/types.h>
+#if HAVE_INTTYPES_H
+# include <inttypes.h> /* for intmax_t */
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
 #endif
 
 #include "mpfr-test.h"
@@ -96,7 +96,7 @@ check_vprintf (char *fmt, ...)
 }
 
 static void
-check_special ()
+check_special (void)
 {
   mpfr_t x;
 
@@ -142,9 +142,9 @@ check_special ()
 }
 
 static void
-check_mixed ()
+check_mixed (void)
 {
-  char ch = 'a';
+  int ch = 'a';
   signed char sch = -1;
   unsigned char uch = 1;
   short sh = -1;
@@ -185,16 +185,25 @@ check_mixed ()
   check_length (2, ulo, 37, lu);
   check_vprintf ("a. %hi, b. %*f, c. %Re%hn", ush, 3, f, mpfr, &ush);
   check_length (3, ush, 29, hu);
-  check_vprintf ("a. %hi, b. %e, c. %#.2Rf%n", sh, d, mpfr, &i);
-  check_length (4, i, 33, d);
+  check_vprintf ("a. %hi, b. %f, c. %#.2Rf%n", sh, d, mpfr, &i);
+  check_length (4, i, 29, d);
   check_vprintf ("a. %R*A, b. %Fe, c. %i%zn", rnd, mpfr, mpf, sz, &sz);
   check_length (5, sz, 34, zu);
-  check_vprintf ("a. %Pu, b. %c, c. %Lf, d. %Zi%Zn", prec, ch, ld, mpz, &mpz);
-  check_length_with_cmp (6, mpz, 31, mpz_cmp_ui (mpz, 31), Zi);
-  check_vprintf ("%% a. %#.0RNg, b. %Qx%Rn, c. %td, d. %p", mpfr, mpq, &mpfr,
-                 p, &i);
+  check_vprintf ("a. %Pu, b. %c, c. %RUG, d. %Zi%Zn", prec, ch, mpfr, mpz, &mpz);
+  check_length_with_cmp (6, mpz, 24, mpz_cmp_ui (mpz, 24), Zi);
+  check_vprintf ("%% a. %#.0RNg, b. %Qx%Rn c. %p", mpfr, mpq, &mpfr, &i);
   check_length_with_cmp (7, mpfr, 16, mpfr_cmp_ui (mpfr, 16), Rg);
 
+#ifndef NPRINTF_T
+  check_vprintf ("%% a. %RNg, b. %Qx, c. %td%tn", mpfr, mpq, p, &p);
+  check_length (8, p, 21, td);
+#endif
+
+#ifndef NPRINTF_L
+  check_vprintf ("a. %RA, b. %Lf, c. %QX%zn", mpfr, ld, mpq, &sz);
+  check_length (9, sz, 30, zu);
+#endif
+
 #ifdef HAVE_LONG_LONG
   {
     long long llo = -1;
@@ -207,19 +216,7 @@ check_mixed ()
   }
 #endif
 
-#ifdef HAVE_QUAD_T
-  {
-    quad_t q = -1;
-    u_quad_t uq = 1;
-
-    check_vprintf ("a. %Re, b. %qx%Qn", mpfr, uq, &mpq);
-    check_length_with_cmp (21, mpq, 16, mpq_cmp_ui (mpq, 16, 1), Qu);
-    check_vprintf ("a. %qi, b. %Rf%Fn", q, mpfr, &mpf);
-    check_length_with_cmp (22, mpf, 12, mpf_cmp_ui (mpf, 12), Fg);
-  }
-#endif
-
-#ifdef _MPFR_H_HAVE_INTMAX_T
+#if defined(_MPFR_H_HAVE_INTMAX_T) && !defined(NPRINTF_J)
   {
     intmax_t im = -1;
     uintmax_t uim = 1;
diff --git a/tests/trandom.c b/tests/trandom.c
index 377996ce9..c1680c4f6 100644
--- a/tests/trandom.c
+++ b/tests/trandom.c
@@ -1,6 +1,6 @@
 /* Test file for the various mpfr_random fonctions.
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/trec_sqrt.c b/tests/trec_sqrt.c
index 523af6753..cddb1becb 100644
--- a/tests/trec_sqrt.c
+++ b/tests/trec_sqrt.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_rec_sqrt.
 
-Copyright 2008 Free Software Foundation, Inc.
+Copyright 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tremquo.c b/tests/tremquo.c
index 980499201..6d410ae07 100644
--- a/tests/tremquo.c
+++ b/tests/tremquo.c
@@ -1,6 +1,6 @@
 /* tremquo -- test file for mpfr_remquo and mpfr_remainder
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/trint.c b/tests/trint.c
index 797a3b6d9..7eee49709 100644
--- a/tests/trint.c
+++ b/tests/trint.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_rint, mpfr_trunc, mpfr_floor, mpfr_ceil, mpfr_round.
 
-Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/troot.c b/tests/troot.c
index 847ed6b55..fcc771dea 100644
--- a/tests/troot.c
+++ b/tests/troot.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_root.
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tround_prec.c b/tests/tround_prec.c
index 731cd4ded..0f7728b90 100644
--- a/tests/tround_prec.c
+++ b/tests/tround_prec.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_prec_round.
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tsec.c b/tests/tsec.c
index 666fb9c2c..fb4448bcf 100644
--- a/tests/tsec.c
+++ b/tests/tsec.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_sec.
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tsech.c b/tests/tsech.c
index 83b923224..1ba9e7a1d 100644
--- a/tests/tsech.c
+++ b/tests/tsech.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_sech.
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tset.c b/tests/tset.c
index d0dfb2ee3..4b02ea085 100644
--- a/tests/tset.c
+++ b/tests/tset.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_set.
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -27,7 +27,7 @@ MA 02110-1301, USA. */
 
 /* Maybe better create its own test file ? */
 static void
-check_neg_special ()
+check_neg_special (void)
 {
   mpfr_t x;
   mpfr_init (x);
diff --git a/tests/tset_d.c b/tests/tset_d.c
index adaad75fb..26431c971 100644
--- a/tests/tset_d.c
+++ b/tests/tset_d.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_set_d and mpfr_get_d.
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -31,7 +31,8 @@ main (int argc, char *argv[])
 {
   mpfr_t x, y, z;
   unsigned long k, n;
-  double d, dd;
+  volatile double d;
+  double dd;
 
   tests_start_mpfr ();
   mpfr_test_init ();
@@ -64,18 +65,41 @@ main (int argc, char *argv[])
 
   mpfr_init (x);
 
-  d = 0.0;
-  mpfr_set_d (x, d, GMP_RNDN);
-  MPFR_ASSERTN(mpfr_cmp_ui (x, 0) == 0 && MPFR_IS_POS(x));
-  mpfr_set_d (x, -d, GMP_RNDN);
-  MPFR_ASSERTN(mpfr_cmp_ui (x, 0) == 0 && MPFR_IS_NEG(x));
-
   mpfr_set_nan (x);
   d = mpfr_get_d (x, GMP_RNDN);
-  MPFR_ASSERTN (DOUBLE_ISNAN (d));
+  if (! DOUBLE_ISNAN (d))
+    {
+      printf ("ERROR for NAN (1)\n");
+#ifdef MPFR_NANISNAN
+      printf ("The reason is that NAN == NAN. Please look at the configure "
+              "output\nand Section \"In case of problem\" of the INSTALL "
+              "file.\n");
+#endif
+      exit (1);
+    }
   mpfr_set_ui (x, 0, GMP_RNDN);
   mpfr_set_d (x, d, GMP_RNDN);
-  MPFR_ASSERTN(mpfr_nan_p (x));
+  if (! mpfr_nan_p (x))
+    {
+      printf ("ERROR for NAN (2)\n");
+#ifdef MPFR_NANISNAN
+      printf ("The reason is that NAN == NAN. Please look at the configure "
+              "output\nand Section \"In case of problem\" of the INSTALL "
+              "file.\n");
+#endif
+      exit (1);
+    }
+
+  d = 0.0;
+  mpfr_set_d (x, d, GMP_RNDN);
+  MPFR_ASSERTN(mpfr_cmp_ui (x, 0) == 0 && MPFR_IS_POS(x));
+  d = -d;
+  mpfr_set_d (x, d, GMP_RNDN);
+  if (mpfr_cmp_ui (x, 0) != 0 || MPFR_IS_POS(x))
+    {
+      printf ("Error in mpfr_set_d on -0\n");
+      exit (1);
+    }
 
   mpfr_set_inf (x, 1);
   d = mpfr_get_d (x, GMP_RNDN);
@@ -164,6 +188,7 @@ main (int argc, char *argv[])
               d, mpfr_get_d1 (x));
       exit (1);
     }
+
   n = (argc==1) ? 500000 : atoi(argv[1]);
   for (k = 1; k <= n; k++)
     {
diff --git a/tests/tset_exp.c b/tests/tset_exp.c
index 56e1e53ec..4828ae1b2 100644
--- a/tests/tset_exp.c
+++ b/tests/tset_exp.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_set_exp.
 
-Copyright 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tset_f.c b/tests/tset_f.c
index 61c13c80c..c553bb476 100644
--- a/tests/tset_f.c
+++ b/tests/tset_f.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_set_f.
 
-Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tset_ld.c b/tests/tset_ld.c
index cf2cb09fe..50d330e2c 100644
--- a/tests/tset_ld.c
+++ b/tests/tset_ld.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_set_ld and mpfr_get_ld.
 
-Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -48,6 +48,9 @@ check_gcc33_bug (void)
 static int
 Isnan_ld (long double d)
 {
+  double e = (double) d;
+  if (DOUBLE_ISNAN (e))
+    return 1;
   LONGDOUBLE_NAN_ACTION (d, goto yes);
   return 0;
  yes:
@@ -77,7 +80,9 @@ check_set_get (long double d, mpfr_t x)
           exit (1);
         }
       e = mpfr_get_ld (x, (mp_rnd_t) r);
-      if (e != d && !(Isnan_ld(e) && Isnan_ld(d)))
+      if ((Isnan_ld(d) && ! Isnan_ld(e)) ||
+          (Isnan_ld(e) && ! Isnan_ld(d)) ||
+          (e != d && !(Isnan_ld(e) && Isnan_ld(d))))
         {
           printf ("Error: mpfr_get_ld o mpfr_set_ld <> Id\n");
           printf ("  r=%d\n", r);
@@ -86,6 +91,12 @@ check_set_get (long double d, mpfr_t x)
           printf ("  x="); mpfr_out_str (NULL, 16, 0, x, GMP_RNDN);
           printf ("\n");
           ld_trace ("  e", e);
+#ifdef MPFR_NANISNAN
+          if (Isnan_ld(d) || Isnan_ld(e))
+            printf ("The reason is that NAN == NAN. Please look at the "
+                    "configure output\nand Section \"In case of problem\" "
+                    "of the INSTALL file.\n");
+#endif
           exit (1);
         }
     }
@@ -158,13 +169,18 @@ main (int argc, char *argv[])
 
   mpfr_init2 (x, MPFR_LDBL_MANT_DIG);
 
+  /* check NaN */
+  mpfr_set_nan (x);
+  d = mpfr_get_ld (x, GMP_RNDN);
+  check_set_get (d, x);
+
   /* check +0.0 and -0.0 */
   d = 0.0;
   check_set_get (d, x);
   d = DBL_NEG_ZERO;
   check_set_get (d, x);
 
-  /* checks that sign of -0.0 is set */
+  /* check that the sign of -0.0 is set */
   mpfr_set_ld (x, DBL_NEG_ZERO, GMP_RNDN);
   if (MPFR_SIGN(x) > 0)
     {
@@ -175,41 +191,38 @@ main (int argc, char *argv[])
 #endif
     }
 
-  /* checks NaN, Inf and -Inf */
-  mpfr_set_nan (x);
-  d = mpfr_get_ld (x, GMP_RNDN);
-  check_set_get (d, x);
-
+  /* check +Inf */
   mpfr_set_inf (x, 1);
   d = mpfr_get_ld (x, GMP_RNDN);
   check_set_get (d, x);
 
+  /* check -Inf */
   mpfr_set_inf (x, -1);
   d = mpfr_get_ld (x, GMP_RNDN);
   check_set_get (d, x);
 
-  /* checks the largest power of two */
+  /* check the largest power of two */
   d = 1.0; while (d < LDBL_MAX / 2.0) d += d;
   check_set_get (d, x);
   check_set_get (-d, x);
 
-  /* checks largest long double */
+  /* check largest long double */
   d = LDBL_MAX;
   check_set_get (d, x);
   check_set_get (-d, x);
 
-  /* checks the smallest power of two */
+  /* check the smallest power of two */
   d = 1.0;
   while ((e = d / 2.0) != (long double) 0.0 && e != d)
     d = e;
   check_set_get (d, x);
   check_set_get (-d, x);
 
-  /* checks largest 2^(2^k) that is representable as a long double */
+  /* check largest 2^(2^k) that is representable as a long double */
   d = (LDBL_MAX / 2) + (LDBL_MAX / 4 * LDBL_EPSILON);
   check_set_get (d, x);
 
-  /* checks that 2^i, 2^i+1 and 2^i-1 are correctly converted */
+  /* check that 2^i, 2^i+1 and 2^i-1 are correctly converted */
   d = 1.0;
   for (i = 1; i < MPFR_LDBL_MANT_DIG; i++)
     {
diff --git a/tests/tset_q.c b/tests/tset_q.c
index a7679628d..0666a215f 100644
--- a/tests/tset_q.c
+++ b/tests/tset_q.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_set_q.
 
-Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tset_si.c b/tests/tset_si.c
index 9a8c2af73..413bc9e06 100644
--- a/tests/tset_si.c
+++ b/tests/tset_si.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_set_si and mpfr_set_ui.
 
-Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tset_sj.c b/tests/tset_sj.c
index 724700754..2fbe025fe 100644
--- a/tests/tset_sj.c
+++ b/tests/tset_sj.c
@@ -1,7 +1,7 @@
 /* Test file for
    mpfr_set_sj, mpfr_set_uj, mpfr_set_sj_2exp and mpfr_set_uj_2exp.
 
-Copyright 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -36,17 +36,22 @@ MA 02110-1301, USA. */
 # define __STDC_CONSTANT_MACROS
 #endif
 
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
+#if HAVE_INTTYPES_H
+# include <inttypes.h> /* for intmax_t */
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
 #endif
 
 #include "mpfr-test.h"
 
 #ifndef _MPFR_H_HAVE_INTMAX_T
-int main() { return 0; }
+int
+main (void)
+{
+  return 0;
+}
 #else
 
 #define ERROR(str) {printf("Error for "str"\n"); exit(1);}
@@ -149,7 +154,7 @@ check_set_uj_2exp (void)
 }
 
 static void
-check_set_sj ()
+check_set_sj (void)
 {
   mpfr_t x;
   int inex;
@@ -170,7 +175,7 @@ check_set_sj ()
 }
 
 static void
-check_set_sj_2exp ()
+check_set_sj_2exp (void)
 {
   mpfr_t x;
   int inex;
diff --git a/tests/tset_str.c b/tests/tset_str.c
index bfff9f977..b707f8f0f 100644
--- a/tests/tset_str.c
+++ b/tests/tset_str.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_set_str.
 
-Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -34,7 +34,7 @@ MA 02110-1301, USA. */
   mpfr_set_str_binary (x, t); \
   if (mpfr_cmp (x, y)) \
     { \
-      printf ("Error in mpfr_set_str (%u):\n", n); \
+      printf ("Error in mpfr_set_str (%d):\n", n); \
       mpfr_print_binary (x); \
       puts (""); \
       mpfr_print_binary (y); \
diff --git a/tests/tset_z.c b/tests/tset_z.c
index af9a35679..81bb90dcb 100644
--- a/tests/tset_z.c
+++ b/tests/tset_z.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_set_z.
 
-Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tsgn.c b/tests/tsgn.c
index cb6ebf3ac..7529c4690 100644
--- a/tests/tsgn.c
+++ b/tests/tsgn.c
@@ -1,6 +1,6 @@
 /* tsgn -- Test for the sign of a floating point number.
 
-Copyright 2003, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2003, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tsi_op.c b/tests/tsi_op.c
index a7597f68f..15c393801 100644
--- a/tests/tsi_op.c
+++ b/tests/tsi_op.c
@@ -1,7 +1,7 @@
 /* Test file for mpfr_add_si, mpfr_sub_si, mpfr_si_sub, mpfr_mul_si,
    mpfr_div_si, mpfr_si_div
 
-Copyright 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -50,7 +50,7 @@ const struct {
 };
 
 static void
-check_invert ()
+check_invert (void)
 {
   mpfr_t x;
   mpfr_init2 (x, MPFR_PREC_MIN);
diff --git a/tests/tsin.c b/tests/tsin.c
index b556c2ac3..f4ca49b64 100644
--- a/tests/tsin.c
+++ b/tests/tsin.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_sin.
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -204,7 +204,7 @@ check_nans (void)
 const char xs[] = "0.111011111110110000111000001100000111110E-1";
 
 static void
-check_regression ()
+check_regression (void)
 {
   mpfr_t x, y;
   mp_prec_t p;
diff --git a/tests/tsin_cos.c b/tests/tsin_cos.c
index 410c10d64..67017e41f 100644
--- a/tests/tsin_cos.c
+++ b/tests/tsin_cos.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_sin_cos.
 
-Copyright 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tsinh.c b/tests/tsinh.c
index 79463b2ca..489847b93 100644
--- a/tests/tsinh.c
+++ b/tests/tsinh.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_sinh.
 
-Copyright 2001, 2002, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tsinh_cosh.c b/tests/tsinh_cosh.c
index 10f548d6f..ea400039f 100644
--- a/tests/tsinh_cosh.c
+++ b/tests/tsinh_cosh.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_sinh_cosh.
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tsprintf.c b/tests/tsprintf.c
index dd5e3497a..59d6516bc 100644
--- a/tests/tsprintf.c
+++ b/tests/tsprintf.c
@@ -1,7 +1,7 @@
 /* tsprintf.c -- test file for mpfr_sprintf, mpfr_vsprintf, mpfr_snprintf,
    and mpfr_vsnprintf
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 The GNU MPFR Library is free software; you can redistribute it and/or modify
@@ -139,6 +139,48 @@ check_vsprintf (const char *expected, const char *fmt, ...)
   return n0;
 }
 
+static void
+native_types (void)
+{
+  int c = 'a';
+  int i = -1;
+  unsigned int ui = 1;
+  double d = -1.25;
+  char s[] = "test";
+
+  char buf[255];
+
+  sprintf (buf, "%c", c);
+  check_vsprintf (buf, "%c", c);
+
+  sprintf (buf, "%d", i);
+  check_vsprintf (buf, "%d", i);
+
+  sprintf (buf, "%e", d);
+  check_vsprintf (buf, "%e", d);
+
+  sprintf (buf, "%f", d);
+  check_vsprintf (buf, "%f", d);
+
+  sprintf (buf, "%i", i);
+  check_vsprintf (buf, "%i", i);
+
+  sprintf (buf, "%g", d);
+  check_vsprintf (buf, "%g", d);
+
+  sprintf (buf, "%o", i);
+  check_vsprintf (buf, "%o", i);
+
+  sprintf (buf, "%s", s);
+  check_vsprintf (buf, "%s", s);
+
+  sprintf (buf, "%u", ui);
+  check_vsprintf (buf, "%u", ui);
+
+  sprintf (buf, "%x", ui);
+  check_vsprintf (buf, "%x", ui);
+}
+
 static int
 decimal (void)
 {
@@ -489,11 +531,8 @@ mixed (void)
                   x);
   check_vsprintf ("-12345678.9, 121", "%.1Rf, %i", x, i);
   check_vsprintf ("-12345678, 1e240/45b352", "%.0R*f, %Qx", GMP_RNDZ, x, mpq);
-  check_vsprintf ("121, -12345678.875000000000, 1.290323", "%i, %.*Rf, %Ff",
-                  i, 12, x, mpf);
-  n1 = check_vsprintf ("00000010610209857723, -1.2345678875e+07, 0.032258",
-                       "%.*Zi, %R*e, %Lf%n", 20, mpz, rnd, x, d, &n2);
-
+  n1 = check_vsprintf ("121, -12345678.875000000000, 1.290323", "%i, %.*Rf, %Ff%n",
+                       i, 12, x, mpf, &n2);
   if (n1 != n2)
     {
       printf ("error in number of characters written by mpfr_vsprintf\n");
@@ -501,6 +540,12 @@ mixed (void)
       printf ("     got: %d\n", n1);
       exit (1);
     }
+
+#ifndef NPRINTF_L
+  check_vsprintf ("00000010610209857723, -1.2345678875e+07, 0.032258",
+                  "%.*Zi, %R*e, %Lf", 20, mpz, rnd, x, d);
+#endif
+
   mpf_clear (mpf);
   mpq_clear (mpq);
   mpz_clear (mpz);
@@ -694,7 +739,7 @@ random_double (void)
 }
 
 static void
-bug20080610 ()
+bug20080610 (void)
 {
   /* bug on icc found on June 10, 2008 */
   /* this is not a bug but a different implementation choice: ISO C99 doesn't
@@ -730,7 +775,7 @@ bug20080610 ()
 }
 
 static void
-bug20081214 ()
+bug20081214 (void)
 {
  /* problem with glibc 2.3.6, December 14, 2008:
     the system asprintf outputs "-1.0" instead of "-1.". */
@@ -777,6 +822,7 @@ main (int argc, char **argv)
   locale = setlocale (LC_ALL, "C");
 #endif
 
+  native_types ();
   hexadecimal ();
   binary ();
   decimal ();
diff --git a/tests/tsqr.c b/tests/tsqr.c
index ec288185b..9b41f3935 100644
--- a/tests/tsqr.c
+++ b/tests/tsqr.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_sqr.
 
-Copyright 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tsqrt.c b/tests/tsqrt.c
index ef4225726..cef9b8a1b 100644
--- a/tests/tsqrt.c
+++ b/tests/tsqrt.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_sqrt.
 
-Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -392,7 +392,7 @@ special (void)
   inexact = test_sqrt (y, x, GMP_RNDN);
   if (mpfr_cmp_ui (y, 3) || inexact >= 0)
     {
-      printf ("Error in sqrt(9:1000) for prec=%u\n", BITS_PER_MP_LIMB);
+      printf ("Error in sqrt(9:1000) for prec=%d\n", (int) BITS_PER_MP_LIMB);
       exit (1);
     }
   mpfr_set_prec (x, 2 * BITS_PER_MP_LIMB);
@@ -403,7 +403,7 @@ special (void)
   inexact = test_sqrt (y, x, GMP_RNDN);
   if (mpfr_cmp_ui (y, 1) || inexact >= 0)
     {
-      printf ("Error in sqrt(1) for prec=%u\n", BITS_PER_MP_LIMB);
+      printf ("Error in sqrt(1) for prec=%d\n", (int) BITS_PER_MP_LIMB);
       mpfr_dump (y);
       exit (1);
     }
diff --git a/tests/tsqrt_ui.c b/tests/tsqrt_ui.c
index 8d0d80953..397abede2 100644
--- a/tests/tsqrt_ui.c
+++ b/tests/tsqrt_ui.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_sqrt_ui.
 
-Copyright 2000, 2001, 2002, 2003, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2000, 2001, 2002, 2003, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tstckintc.c b/tests/tstckintc.c
index 7751f9700..83fd63f85 100644
--- a/tests/tstckintc.c
+++ b/tests/tstckintc.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_custom_*
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tstrtofr.c b/tests/tstrtofr.c
index e647cd326..336d97e07 100644
--- a/tests/tstrtofr.c
+++ b/tests/tstrtofr.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_set_str.
 
-Copyright 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -189,7 +189,8 @@ int randomab (int a, int b)
   return a + rand () % (b-a);
 }
 
-int main()
+int
+main (void)
 {
   int i, base;
   mpfr_t x;
@@ -531,7 +532,7 @@ static struct dymmy_test {
 };
 
 static void
-check_reftable ()
+check_reftable (void)
 {
   int i, base;
   mpfr_t x, y;
diff --git a/tests/tsub.c b/tests/tsub.c
index 990f736fa..06c440c11 100644
--- a/tests/tsub.c
+++ b/tests/tsub.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_sub.
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tsub1sp.c b/tests/tsub1sp.c
index c7c8de7d9..40996974c 100644
--- a/tests/tsub1sp.c
+++ b/tests/tsub1sp.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_sub1sp.
 
-Copyright 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -25,10 +25,11 @@ MA 02110-1301, USA. */
 
 #include "mpfr-test.h"
 
-void check_special(void);
-void check_random(mpfr_prec_t p);
+static void check_special (void);
+static void check_random (mpfr_prec_t p);
 
-int main(void)
+int
+main (void)
 {
   mpfr_prec_t p;
 
@@ -66,7 +67,8 @@ int main(void)
                exit(1);\
             }
 
-void check_random(mpfr_prec_t p)
+static void
+check_random (mpfr_prec_t p)
 {
   mpfr_t x,y,z,x2;
   int r;
@@ -93,7 +95,8 @@ void check_random(mpfr_prec_t p)
   mpfr_clears (x, y, z, x2, (mpfr_ptr) 0);
 }
 
-void check_special(void)
+static void
+check_special (void)
 {
   mpfr_t x,y,z,x2;
   int r;
diff --git a/tests/tsub_d.c b/tests/tsub_d.c
index 84b1746de..b1b154ea7 100644
--- a/tests/tsub_d.c
+++ b/tests/tsub_d.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_sub_d
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tsub_ui.c b/tests/tsub_ui.c
index bd0f93fa3..46291b7ce 100644
--- a/tests/tsub_ui.c
+++ b/tests/tsub_ui.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_sub_ui
 
-Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tsubnormal.c b/tests/tsubnormal.c
index 67fb1d0a6..da81e1724 100644
--- a/tests/tsubnormal.c
+++ b/tests/tsubnormal.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_subnormalize.
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tsum.c b/tests/tsum.c
index 9d106c948..b89ff36a9 100644
--- a/tests/tsum.c
+++ b/tests/tsum.c
@@ -1,6 +1,6 @@
 /* tsum -- test file for the list summation function
 
-Copyright 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tswap.c b/tests/tswap.c
index f03b7d2b5..ee19e5240 100644
--- a/tests/tswap.c
+++ b/tests/tswap.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_swap.
 
-Copyright 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/ttan.c b/tests/ttan.c
index 799e8932c..5a55a0d0c 100644
--- a/tests/ttan.c
+++ b/tests/ttan.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_tan.
 
-Copyright 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/ttanh.c b/tests/ttanh.c
index c824030fa..42edf29dd 100644
--- a/tests/ttanh.c
+++ b/tests/ttanh.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_tanh.
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/ttrunc.c b/tests/ttrunc.c
index 7069dad72..b66555887 100644
--- a/tests/ttrunc.c
+++ b/tests/ttrunc.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_trunc, mpfr_ceil, mpfr_floor.
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tui_div.c b/tests/tui_div.c
index 41a6d2aaf..d4f596b32 100644
--- a/tests/tui_div.c
+++ b/tests/tui_div.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_ui_div.
 
-Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tui_pow.c b/tests/tui_pow.c
index 84b0a19e3..31cd036be 100644
--- a/tests/tui_pow.c
+++ b/tests/tui_pow.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_ui_pow and mpfr_ui_pow_ui.
 
-Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tui_sub.c b/tests/tui_sub.c
index 4771efb9b..5e9ccea0d 100644
--- a/tests/tui_sub.c
+++ b/tests/tui_sub.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_ui_sub.
 
-Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tversion.c b/tests/tversion.c
index c43402aa2..554793c44 100644
--- a/tests/tversion.c
+++ b/tests/tversion.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_version.
 
-Copyright 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -50,11 +50,17 @@ main (void)
     }
 #endif
 
-  if (__GNU_MP_VERSION_PATCHLEVEL != 0)
-    sprintf (buffer, "%d.%d.%d", __GNU_MP_VERSION, __GNU_MP_VERSION_MINOR,
-             __GNU_MP_VERSION_PATCHLEVEL);
-  else
-    sprintf (buffer, "%d.%d", __GNU_MP_VERSION, __GNU_MP_VERSION_MINOR);
+  sprintf (buffer, "%d.%d.%d", __GNU_MP_VERSION, __GNU_MP_VERSION_MINOR,
+           __GNU_MP_VERSION_PATCHLEVEL);
+  if (strcmp (buffer, gmp_version) == 0)
+    return 0;
+  if (__GNU_MP_VERSION_PATCHLEVEL == 0)
+    {
+      sprintf (buffer, "%d.%d", __GNU_MP_VERSION, __GNU_MP_VERSION_MINOR);
+      if (strcmp (buffer, gmp_version) == 0)
+        return 0;
+    }
+
   /* In some cases, it may be acceptable to have different versions for
      the header and the library, in particular when shared libraries are
      used (e.g., after a bug-fix upgrade of the library). Versioning takes
@@ -63,12 +69,11 @@ main (void)
      uses GMP internals, which may lead to incompatibilities even though
      GMP's public interface has not changed (the following warning is
      useful in that case too). */
-  if (strcmp (buffer, gmp_version) != 0)
-    printf ("The versions of gmp.h (%s) and libgmp (%s) do not seem to "
-            "match.\nThis may lead to errors, in particular with MPFR. "
-            "If some tests fail,\nplease check that first. As we are not "
-            "sure, we do not regard this as\nan error.\n",
-            buffer, gmp_version);
+  printf ("WARNING! The versions of gmp.h (%s) and libgmp (%s) do not "
+          "match.\nThis may lead to errors, in particular with MPFR. "
+          "If some tests fail,\nplease check that first. As we are not "
+          "sure, we do not regard this as\nan error.\n",
+          buffer, gmp_version);
 
   return 0;
 }
diff --git a/tests/ty0.c b/tests/ty0.c
index 4c848ee8a..fbc52c707 100644
--- a/tests/ty0.c
+++ b/tests/ty0.c
@@ -1,6 +1,6 @@
 /* ty0 -- test file for the Bessel function of second kind (order 0)
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/ty1.c b/tests/ty1.c
index 572780eb0..7eab4a9b6 100644
--- a/tests/ty1.c
+++ b/tests/ty1.c
@@ -1,6 +1,6 @@
 /* ty1 -- test file for the Bessel function of second kind (order 1)
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tyn.c b/tests/tyn.c
index 28d1da121..c1e09ebeb 100644
--- a/tests/tyn.c
+++ b/tests/tyn.c
@@ -1,6 +1,6 @@
 /* tyn -- test file for the Bessel function of second kind
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tzeta.c b/tests/tzeta.c
index e0859b233..0917cd9b3 100644
--- a/tests/tzeta.c
+++ b/tests/tzeta.c
@@ -1,6 +1,6 @@
 /* tzeta -- test file for the Riemann Zeta function
 
-Copyright 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by Jean-Luc Re'my and the Spaces project, INRIA Lorraine.
 
 This file is part of the GNU MPFR Library.
diff --git a/tests/tzeta_ui.c b/tests/tzeta_ui.c
index fa4907dc9..6fb20f0d9 100644
--- a/tests/tzeta_ui.c
+++ b/tests/tzeta_ui.c
@@ -1,6 +1,6 @@
 /* Test file for mpfr_zeta_ui.
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/tuneup.c b/tuneup.c
index 16768e206..4e8760f3b 100644
--- a/tuneup.c
+++ b/tuneup.c
@@ -1,6 +1,6 @@
 /* Tune various threshold of MPFR
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/uceil_exp2.c b/uceil_exp2.c
index c0d0bda9a..42a6c01d0 100644
--- a/uceil_exp2.c
+++ b/uceil_exp2.c
@@ -1,6 +1,6 @@
 /* __gmpfr_ceil_exp2 - returns y >= 2^d
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/uceil_log2.c b/uceil_log2.c
index 896f405e3..4dcee7f3d 100644
--- a/uceil_log2.c
+++ b/uceil_log2.c
@@ -1,6 +1,6 @@
 /* __gmpfr_ceil_log2 - returns ceil(log(d)/log(2))
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/ufloor_log2.c b/ufloor_log2.c
index 14784e2a6..2c3c0b611 100644
--- a/ufloor_log2.c
+++ b/ufloor_log2.c
@@ -1,6 +1,6 @@
 /* __gmpfr_floor_log2 - returns floor(log(d)/log(2))
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/ui_div.c b/ui_div.c
index db3c09968..6ad52e4d9 100644
--- a/ui_div.c
+++ b/ui_div.c
@@ -1,7 +1,7 @@
 /* mpfr_ui_div -- divide a machine integer by a floating-point number
    mpfr_si_div -- divide a machine number by a floating-point number
 
-Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/ui_pow.c b/ui_pow.c
index 45c82fbab..5fa66a701 100644
--- a/ui_pow.c
+++ b/ui_pow.c
@@ -1,6 +1,6 @@
 /* mpfr_ui_pow -- power of n function n^x
 
-Copyright 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/ui_pow_ui.c b/ui_pow_ui.c
index beb21fc10..f72a90773 100644
--- a/ui_pow_ui.c
+++ b/ui_pow_ui.c
@@ -1,6 +1,6 @@
 /*  mpfr_ui_pow_ui -- compute the power beetween two machine integer
 
-Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/ui_sub.c b/ui_sub.c
index ff2801aeb..0e0b3ac8b 100644
--- a/ui_sub.c
+++ b/ui_sub.c
@@ -1,6 +1,6 @@
 /* mpfr_ui_sub -- subtract a floating-point number from an integer
 
-Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/urandomb.c b/urandomb.c
index 1d2aa56fd..12e9b7b59 100644
--- a/urandomb.c
+++ b/urandomb.c
@@ -3,7 +3,7 @@
    using STATE as the random state previously initialized by a call to
    gmp_randinit().
 
-Copyright 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/vasprintf.c b/vasprintf.c
index 7a08477b9..3089a3a36 100644
--- a/vasprintf.c
+++ b/vasprintf.c
@@ -1,7 +1,7 @@
 /* mpfr_vasprintf -- main function for the printf functions family
    plus helper macros & functions.
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
@@ -41,12 +41,12 @@ MA 02110-1301, USA. */
 #include <stddef.h>             /* for ptrdiff_t */
 #endif
 
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-
-#ifdef HAVE_QUAD_T
-#include <sys/types.h>
+#if HAVE_INTTYPES_H
+# include <inttypes.h> /* for intmax_t */
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
 #endif
 
 #include <string.h>             /* for strlen, memcpy and others */
@@ -258,17 +258,9 @@ parse_arg_type (const char *format, struct printf_spec *specinfo)
           specinfo->arg_type = LONG_ARG;
           break;
         }
-    case 'q':
-      ++format;
-#ifdef HAVE_QUAD_T
-      specinfo->arg_type = QUAD_ARG;
-#else
-      specinfo->arg_type = UNSUPPORTED;
-#endif
-      break;
     case 'j':
       ++format;
-#ifdef HAVE_STDINT_H
+#if defined(_MPFR_H_HAVE_INTMAX_T) && !defined(NPRINTF_J)
       specinfo->arg_type = INTMAX_ARG;
 #else
       specinfo->arg_type = UNSUPPORTED;
@@ -280,11 +272,19 @@ parse_arg_type (const char *format, struct printf_spec *specinfo)
       break;
     case 't':
       ++format;
+#ifndef NPRINTF_T
       specinfo->arg_type = PTRDIFF_ARG;
+#else
+      specinfo->arg_type = UNSUPPORTED;
+#endif
       break;
     case 'L':
       ++format;
+#ifndef NPRINTF_L
       specinfo->arg_type = LONG_DOUBLE_ARG;
+#else
+      specinfo->arg_type = UNSUPPORTED;
+#endif
       break;
     case 'F':
       ++format;
@@ -324,14 +324,6 @@ parse_arg_type (const char *format, struct printf_spec *specinfo)
 /* some macros and functions filling the buffer */
 
 /* CONSUME_VA_ARG removes from va_list AP the type expected by SPECINFO */
-#ifdef HAVE_STDINT_H
-#define CASE_INTMAX_ARG(specinfo, ap)           \
-  case INTMAX_ARG:                              \
-  (void) va_arg ((ap), intmax_t);               \
-  break;
-#else
-#define CASE_INTMAX_ARG(specinfo, ap)
-#endif
 
 /* With a C++ compiler wchar_t and enumeration in va_list are converted to
    integer type : int, unsigned int, long or unsigned long (unfortunately,
@@ -357,6 +349,14 @@ parse_arg_type (const char *format, struct printf_spec *specinfo)
   break;
 #endif
 
+#if defined(_MPFR_H_HAVE_INTMAX_T)
+#define CASE_INTMAX_ARG(specinfo, ap)           \
+  case INTMAX_ARG:                              \
+  (void) va_arg ((ap), intmax_t);               \
+  break;
+#else
+#define CASE_INTMAX_ARG(specinfo, ap)
+#endif
 
 #ifdef HAVE_LONG_LONG
 #define CASE_LONG_LONG_ARG(specinfo, ap)        \
@@ -367,15 +367,6 @@ parse_arg_type (const char *format, struct printf_spec *specinfo)
 #define CASE_LONG_LONG_ARG(specinfo, ap)
 #endif
 
-#ifdef HAVE_QUAD_T
-#define CASE_QUAD_ARG(specinfo, ap)             \
-  case QUAD_ARG:                                \
-  (void) va_arg ((ap), quad_t);                 \
-  break;
-#else
-#define CASE_QUAD_ARG(specinfo, ap)
-#endif
-
 #define CONSUME_VA_ARG(specinfo, ap)            \
   do {                                          \
     switch ((specinfo).arg_type)                \
@@ -386,7 +377,6 @@ parse_arg_type (const char *format, struct printf_spec *specinfo)
         break;                                  \
       CASE_LONG_ARG (specinfo, ap)              \
       CASE_LONG_LONG_ARG (specinfo, ap)         \
-      CASE_QUAD_ARG(specinfo, ap)               \
       CASE_INTMAX_ARG (specinfo, ap)            \
       case SIZE_ARG:                            \
         (void) va_arg ((ap), size_t);           \
@@ -1951,7 +1941,7 @@ mpfr_vasprintf (char **ptr, const char *fmt, va_list ap)
               *(long long *) p = (long long) nchar;
               break;
 #endif
-#ifdef HAVE_STDINT_H
+#ifdef _MPFR_H_HAVE_INTMAX_T
             case INTMAX_ARG:
               *(intmax_t *) p = (intmax_t) nchar;
               break;
diff --git a/version.c b/version.c
index 1984b2728..641cc899e 100644
--- a/version.c
+++ b/version.c
@@ -1,6 +1,6 @@
 /* mpfr_get_version -- MPFR version
 
-Copyright 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/volatile.c b/volatile.c
index 6298be6eb..1bba5dff5 100644
--- a/volatile.c
+++ b/volatile.c
@@ -4,7 +4,7 @@
    CERTAIN TO BE SUBJECT TO INCOMPATIBLE CHANGES OR DISAPPEAR COMPLETELY IN
    FUTURE MPFR RELEASES.
 
-Copyright 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/yn.c b/yn.c
index 485181a6a..86cf4d421 100644
--- a/yn.c
+++ b/yn.c
@@ -1,7 +1,7 @@
 /* mpfr_y0, mpfr_y1, mpfr_yn -- Bessel functions of 2nd kind, integer order.
    http://www.opengroup.org/onlinepubs/009695399/functions/y0.html
 
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.
diff --git a/zeta.c b/zeta.c
index d05397f02..8b57b103b 100644
--- a/zeta.c
+++ b/zeta.c
@@ -1,6 +1,6 @@
 /* mpfr_zeta -- compute the Riemann Zeta function
 
-Copyright 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by Jean-Luc Re'my and the Spaces project, INRIA Lorraine.
 
 This file is part of the GNU MPFR Library.
diff --git a/zeta_ui.c b/zeta_ui.c
index 52fa0851e..b2c6b9230 100644
--- a/zeta_ui.c
+++ b/zeta_ui.c
@@ -1,6 +1,6 @@
 /* mpfr_zeta_ui -- compute the Riemann Zeta function for integer argument.
 
-Copyright 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 Contributed by the Arenaire and Cacao projects, INRIA.
 
 This file is part of the GNU MPFR Library.