From owner-svn-src-all@FreeBSD.ORG  Thu Jan  5 12:06:51 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 77A3D106566C;
	Thu,  5 Jan 2012 12:06:50 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 27E098FC0A;
	Thu,  5 Jan 2012 12:06:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q05C6n1G034452;
	Thu, 5 Jan 2012 12:06:49 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q05C6n9Y034450;
	Thu, 5 Jan 2012 12:06:49 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201201051206.q05C6n9Y034450@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Thu, 5 Jan 2012 12:06:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229591 - head/include
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Jan 2012 12:06:51 -0000

Author: ed
Date: Thu Jan  5 12:06:49 2012
New Revision: 229591
URL: http://svn.freebsd.org/changeset/base/229591

Log:
  Remove _Complex_I workaround from <tgmath.h>.
  
  This removes the use of __typeof() from this header, thus making it work
  with a plain C11 compiler.

Modified:
  head/include/tgmath.h

Modified: head/include/tgmath.h
==============================================================================
--- head/include/tgmath.h	Thu Jan  5 12:05:48 2012	(r229590)
+++ head/include/tgmath.h	Thu Jan  5 12:06:49 2012	(r229591)
@@ -53,9 +53,6 @@
  * Note that these macros cannot be implemented with C's ?: operator,
  * because the return type of the whole expression would incorrectly be long
  * double complex regardless of the argument types.
- *
- * The _Complex_I distinction should not be needed, but due to a bug in
- * GCC 4.2, _Complex_I is not of type float _Complex.
  */
 
 #ifndef __generic
@@ -66,9 +63,8 @@
 	__generic(x, long double _Complex, fnl,				\
 	    __generic(x, double _Complex, fn,				\
 	        __generic(x, float _Complex, fnf,			\
-	            __generic(x, __typeof(_Complex_I), fnf,		\
-	                __generic(x, long double, fnl,			\
-	                    __generic(x, float, fnf, fn))))))
+	            __generic(x, long double, fnl,			\
+	                __generic(x, float, fnf, fn)))))
 #define	__tg_impl_simple(x, y, z, fnl, fn, fnf, ...)			\
 	__tg_generic_simple(x,						\
 	    __tg_generic_simple(y,					\
@@ -87,9 +83,8 @@
 	__generic(x, long double _Complex, cfnl,			\
 	    __generic(x, double _Complex, cfn,				\
 	        __generic(x, float _Complex, cfnf,			\
-	            __generic(x, __typeof(_Complex_I), cfnf,		\
-	                __generic(x, long double, fnl,			\
-	                    __generic(x, float, fnf, fn))))))
+	            __generic(x, long double, fnl,			\
+	                __generic(x, float, fnf, fn)))))
 #define	__tg_impl_full(x, y, cfnl, cfn, cfnf, fnl, fn, fnf, ...)	\
 	__tg_generic_full(x,						\
 	    __tg_generic_full(y, cfnl, cfnl, cfnl, cfnl, cfnl, cfnl),	\