From owner-svn-src-user@FreeBSD.ORG  Wed Jun  2 11:08:56 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E035D106566C;
	Wed,  2 Jun 2010 11:08:56 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D02468FC20;
	Wed,  2 Jun 2010 11:08:56 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o52B8uFJ036014;
	Wed, 2 Jun 2010 11:08:56 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o52B8udH036012;
	Wed, 2 Jun 2010 11:08:56 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201006021108.o52B8udH036012@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Wed, 2 Jun 2010 11:08:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208738 - user/jmallett/octeon/sys/contrib/octeon-sdk
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Jun 2010 11:08:57 -0000

Author: jmallett
Date: Wed Jun  2 11:08:56 2010
New Revision: 208738
URL: http://svn.freebsd.org/changeset/base/208738

Log:
  Spell typeof in the preferred way for the FreeBSD kernel.

Modified:
  user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-asm.h

Modified: user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-asm.h
==============================================================================
--- user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-asm.h	Wed Jun  2 11:06:03 2010	(r208737)
+++ user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-asm.h	Wed Jun  2 11:08:56 2010	(r208738)
@@ -225,12 +225,12 @@ extern "C" {
       unsigned long _v;							\
       ASM_STMT ("rdhwr\t%0,$31\n"					\
 		"\tsll\t%0,%0,0" : "=d"(_v));				\
-      result = (typeof(result))_v;					\
+      result = (__typeof__(result))_v;					\
     }									\
   } else {								\
     unsigned long _v;							\
     ASM_STMT ("rdhwr\t%0,$" CVMX_TMP_STR(regstr) : "=d"(_v));		\
-    result = (typeof(result))_v;					\
+    result = (__typeof__(result))_v;					\
   }})