[BZ #865]

	* math/tgmath.h: Correctly determine result type for
	__TGMATH_BINARY_REAL_ONLY,
	__TGMATH_TERNARY_FIRST_SECOND_REAL_ONLY,
	__TGMATH_TERNARY_REAL_ONLY, and __TGMATH_BINARY_REAL_IMAG.

2005-09-17  Andreas Jaeger  <aj@suse.de>

	[BZ #865]
	* math/test-tgmath-int.c: New file.
	* math/Makefile (tests): Add test-tgmath-int.

2005-10-14  Ulrich Drepper  <drepper@redhat.com>

6 files changed, 113 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 19a63525c2..958b79e73d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2005-10-14  Ulrich Drepper  <drepper@redhat.com>
 
+	[BZ #865]
+	* math/tgmath.h: Correctly determine result type for
+	__TGMATH_BINARY_REAL_ONLY,
+	__TGMATH_TERNARY_FIRST_SECOND_REAL_ONLY,
+	__TGMATH_TERNARY_REAL_ONLY, and __TGMATH_BINARY_REAL_IMAG.
+
+2005-09-17  Andreas Jaeger  <aj@suse.de>
+
+	[BZ #865]
+	* math/test-tgmath-int.c: New file.
+	* math/Makefile (tests): Add test-tgmath-int.
+
+2005-10-14  Ulrich Drepper  <drepper@redhat.com>
+
 	[BZ #804]
 	* malloc/tst-mtrace.sh: Work around for bootstraping.
 
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 05ab73fd59..c671fc652d 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,5 +1,8 @@
 2005-10-14  Ulrich Drepper  <drepper@redhat.com>
 
+	[BZ #56]
+	* locales/de_DE: Add transliterations for quoting characters.
+
 	[BZ #448]
 	* locales/vi_VN: Several fixes.
 	Patch by Nguyen Thai Ngoc Duy <pclouds@gmail.com>.
diff --git a/localedata/locales/de_DE b/localedata/locales/de_DE
index 93fded8b2a..51a88d5622 100644
--- a/localedata/locales/de_DE
+++ b/localedata/locales/de_DE
@@ -57,6 +57,19 @@ include "translit_combining";""
 % LATIN SMALL LETTER A WITH RING ABOVE.
 <U00E5> "<U0061><U030A>";"<U0061><U0061>"
 
+% The following strange first-level transliteration derive from the use
+% U201E and U201C as "correct" quoting characters.  These two characters
+% do not really belong together.  The result is that somebody who uses
+% U201C and U201D will get the incorrect U00AB / U00BB sequences.
+% LEFT DOUBLE QUOTATION MARK
+<U201C> <U00AB>;<U0022>
+% RIGHT DOUBLE QUOTATION MARK
+<U201D> <U00BB>;<U0022>
+% DOUBLE LOW-9 QUOTATION MARK
+<U201E> <U00BB>;"<U002C><U002C>"
+% DOUBLE HIGH-REVERSED-9 QUOTATION MARK
+<U201F> <U00AB>;<U0022>
+
 translit_end
 
 END LC_CTYPE
diff --git a/math/Makefile b/math/Makefile
index c4501b87f4..8e5c788403 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1996-2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1996-2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -89,7 +89,7 @@ distribute += $(filter-out $(generated),$(long-m-yes:=.c) $(long-c-yes:=.c))
 # Rules for the test suite.
 tests = test-matherr test-fenv atest-exp atest-sincos atest-exp2 basic-test \
 	test-misc test-fpucw tst-definitions test-tgmath test-tgmath-ret \
-	bug-nextafter bug-nexttoward bug-tgmath1
+	bug-nextafter bug-nexttoward bug-tgmath1 test-tgmath-int
 # We do the `long double' tests only if this data type is available and
 # distinct from `double'.
 test-longdouble-yes = test-ldouble test-ildoubl
diff --git a/math/test-tgmath-int.c b/math/test-tgmath-int.c
new file mode 100644
index 0000000000..99ebe9f508
--- /dev/null
+++ b/math/test-tgmath-int.c
@@ -0,0 +1,71 @@
+/* Test compilation of tgmath macros.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Andreas Jaeger <aj@suse.de>, 2005.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <math.h>
+#include <complex.h>
+#include <tgmath.h>
+#include <stdio.h>
+
+static int errors = 0;
+
+static void
+our_error (const char *c)
+{
+  puts (c);
+  ++errors;
+}
+
+#define CHECK_RET_CONST_TYPE(func, rettype, name)			\
+  if (sizeof (func) != sizeof (rettype))				\
+    our_error ("Return size of " #name " is " #func" wrong");
+
+#define CHECK_RET_CONST_FLOAT(func, name)		\
+  CHECK_RET_CONST_TYPE (func, float, name)
+
+#define CHECK_RET_CONST_DOUBLE(func, name)		\
+  CHECK_RET_CONST_TYPE (func, double, name)
+
+static int
+do_test (void)
+{
+  int i;
+  float f;
+  double d;
+
+  CHECK_RET_CONST_DOUBLE (sin (i), "sin (i)");
+  CHECK_RET_CONST_DOUBLE (pow (i, i), "pow (i, i)");
+  CHECK_RET_CONST_DOUBLE (pow (i, i), "pow (i, i)");
+  CHECK_RET_CONST_DOUBLE (pow (i, f), "pow (i, f)");
+  CHECK_RET_CONST_DOUBLE (pow (i, d), "pow (i, d)");
+  CHECK_RET_CONST_DOUBLE (pow (f, i), "pow (f, i)");
+  CHECK_RET_CONST_DOUBLE (pow (d, i), "pow (d, i)");
+  CHECK_RET_CONST_DOUBLE (fma (i, i, i), "fma (i, i, i)");
+  CHECK_RET_CONST_DOUBLE (fma (f, i, i), "fma (f, i, i)");
+  CHECK_RET_CONST_DOUBLE (fma (i, f, i), "fma (i, f, i)");
+  CHECK_RET_CONST_DOUBLE (fma (i, i, f), "fma (i, i, f)");
+  CHECK_RET_CONST_DOUBLE (fma (d, i, i), "fma (d, i, i)");
+  CHECK_RET_CONST_DOUBLE (fma (i, d, i), "fma (i, d, i)");
+  CHECK_RET_CONST_DOUBLE (fma (i, i, d), "fma (i, i, d)");
+
+  return errors != 0;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
diff --git a/math/tgmath.h b/math/tgmath.h
index ab2cc929ad..f3d23f6e52 100644
--- a/math/tgmath.h
+++ b/math/tgmath.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004
+/* Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -98,7 +98,8 @@
 		       __tgmres; }))
 
 # define __TGMATH_BINARY_REAL_ONLY(Val1, Val2, Fct) \
-     (__extension__ ({ __tgmath_real_type ((Val1) + (Val2)) __tgmres;	      \
+     (__extension__ ({ __typeof((__tgmath_real_type (Val1)) 0		      \
+				+ (__tgmath_real_type (Val2)) 0) __tgmres;    \
 		       if ((sizeof (Val1) > sizeof (double)		      \
 			    || sizeof (Val2) > sizeof (double))		      \
 			   && __builtin_classify_type ((Val1) + (Val2)) == 8) \
@@ -113,7 +114,8 @@
 		       __tgmres; }))
 
 # define __TGMATH_TERNARY_FIRST_SECOND_REAL_ONLY(Val1, Val2, Val3, Fct) \
-     (__extension__ ({ __tgmath_real_type ((Val1) + (Val2)) __tgmres;	      \
+     (__extension__ ({ __typeof((__tgmath_real_type (Val1)) 0		      \
+				+ (__tgmath_real_type (Val2)) 0) __tgmres;    \
 		       if ((sizeof (Val1) > sizeof (double)		      \
 			    || sizeof (Val2) > sizeof (double))		      \
 			   && __builtin_classify_type ((Val1) + (Val2)) == 8) \
@@ -128,7 +130,9 @@
 		       __tgmres; }))
 
 # define __TGMATH_TERNARY_REAL_ONLY(Val1, Val2, Val3, Fct) \
-     (__extension__ ({ __tgmath_real_type ((Val1) + (Val2) + (Val3)) __tgmres;\
+     (__extension__ ({ __typeof((__tgmath_real_type (Val1)) 0		      \
+				+ (__tgmath_real_type (Val2)) 0		      \
+				+ (__tgmath_real_type (Val3)) 0) __tgmres;    \
 		       if ((sizeof (Val1) > sizeof (double)		      \
 			    || sizeof (Val2) > sizeof (double)		      \
 			    || sizeof (Val3) > sizeof (double))		      \
@@ -209,7 +213,8 @@
 /* XXX This definition has to be changed as soon as the compiler understands
    the imaginary keyword.  */
 # define __TGMATH_BINARY_REAL_IMAG(Val1, Val2, Fct, Cfct) \
-     (__extension__ ({ __tgmath_real_type ((Val1) + (Val2)) __tgmres;	      \
+     (__extension__ ({ __typeof((__tgmath_real_type (Val1)) 0		      \
+				+ (__tgmath_real_type (Val2)) 0) __tgmres;    \
 		       if ((sizeof (__real__ (Val1)) > sizeof (double)	      \
 			    || sizeof (__real__ (Val2)) > sizeof (double))    \
 			   && __builtin_classify_type (__real__ (Val1)	      \