From: Eric Blake Date: Wed, 28 Jan 2009 16:57:08 +0000 (-0700) Subject: Fix AC_C_RESTRICT for Sun Studio 12 C++. X-Git-Tag: v2.63b~30 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa30765d64d4a50ad7ce83e78b5699223571ef36;p=thirdparty%2Fautoconf.git Fix AC_C_RESTRICT for Sun Studio 12 C++. * lib/autoconf/c.m4 (AC_C_RESTRICT): Newer Sun Studio C provides __restrict__ rather than _Restrict, which still trips up Sun Studio 12 C++. * THANKS: Update. Reported by Rolf Vandevaart. Signed-off-by: Eric Blake --- diff --git a/ChangeLog b/ChangeLog index 2885f2789..44e147cd2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2009-01-28 Eric Blake + + Fix AC_C_RESTRICT for Sun Studio 12 C++. + * lib/autoconf/c.m4 (AC_C_RESTRICT): Newer Sun Studio C provides + __restrict__ rather than _Restrict, which still trips up Sun + Studio 12 C++. + * THANKS: Update. + Reported by Rolf Vandevaart. + 2009-01-28 Eric Blake Fix years in copyright notices. diff --git a/THANKS b/THANKS index 54310b5f3..74895cf36 100644 --- a/THANKS +++ b/THANKS @@ -304,6 +304,7 @@ Roberto Bagnara bagnara@cs.unipr.it Roger Leigh rleigh@whinlatter.ukfsn.org Roland McGrath roland@gnu.org Rolf Ebert rolf.ebert.gcc@gmx.de +Rolf Vandevaart Rolf.Vandevaart@sun.com Romain Lenglet rlenglet@users.forge.objectweb.org Ruediger Kuhlmann info@ruediger-kuhlmann.de Russ Allbery rra@stanford.edu diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4 index beaf0b151..3fa9c04a8 100644 --- a/lib/autoconf/c.m4 +++ b/lib/autoconf/c.m4 @@ -1,7 +1,7 @@ # This file is part of Autoconf. -*- Autoconf -*- # Programming languages support. -# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free -# Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -1604,13 +1604,14 @@ AC_DEFUN([AC_C_RESTRICT], nothing if this is not supported. Do not define if restrict is supported directly. */ #undef restrict -/* Work around a bug in Sun C++: it does not support _Restrict, even - though the corresponding Sun C compiler does, which causes - "#define restrict _Restrict" in the previous line. Perhaps some future - version of Sun C++ will work with _Restrict; if so, it'll probably - define __RESTRICT, just as Sun C does. */ +/* Work around a bug in Sun C++: it does not support _Restrict or + __restrict__, even though the corresponding Sun C compiler ends up with + "#define restrict _Restrict" or "#define restrict __restrict__" in the + previous line. Perhaps some future version of Sun C++ will work with + restrict; if so, hopefully it defines __RESTRICT like Sun C does. */ #if defined __SUNPRO_CC && !defined __RESTRICT # define _Restrict +# define __restrict__ #endif]) case $ac_cv_c_restrict in restrict) ;;