> > Signed-off-by: Christophe Fergeau <cfergeau@xxxxxxxxxx> > --- > common/verify.h | 24 +++++++++++++++--------- > 1 file changed, 15 insertions(+), 9 deletions(-) > > diff --git a/common/verify.h b/common/verify.h > index 267de29..b2e5f64 100644 > --- a/common/verify.h > +++ b/common/verify.h > @@ -1,19 +1,19 @@ > /* Compile-time assert-like macros. > > - Copyright (C) 2005-2006, 2009-2016 Free Software Foundation, Inc. > + Copyright (C) 2005-2006, 2009-2019 Free Software Foundation, Inc. > > This program 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 > + it under the terms of the GNU General Public License as published by > + the Free Software Foundation; either version 3 of the License, or > (at your option) any later version. > > This program 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. > + GNU General Public License for more details. > What ?? Sure about this? > - You should have received a copy of the GNU Lesser General Public License > - along with this program. If not, see <http://www.gnu.org/licenses/>. */ > + You should have received a copy of the GNU General Public License > + along with this program. If not, see <https://www.gnu.org/licenses/>. > */ > > /* Written by Paul Eggert, Bruno Haible, and Jim Meyering. */ > > @@ -248,7 +248,12 @@ template <int w> > /* Verify requirement R at compile-time, as a declaration without a > trailing ';'. */ > > -#define verify(R) _GL_VERIFY (R, "verify (" #R ")") > +#ifdef __GNUC__ > +# define verify(R) _GL_VERIFY (R, "verify (" #R ")") > +#else > +/* PGI barfs if R is long. Play it safe. */ > +# define verify(R) _GL_VERIFY (R, "verify (...)") > +#endif > > #ifndef __has_builtin > # define __has_builtin(x) 0 > @@ -263,7 +268,7 @@ template <int w> > # define assume(R) ((R) ? (void) 0 : __builtin_unreachable ()) > #elif 1200 <= _MSC_VER > # define assume(R) __assume (R) > -#elif (defined lint \ > +#elif ((defined GCC_LINT || defined lint) \ > && (__has_builtin (__builtin_trap) \ > || 3 < __GNUC__ + (3 < __GNUC_MINOR__ + (4 <= > || __GNUC_PATCHLEVEL__)))) > /* Doing it this way helps various packages when configured with > @@ -271,7 +276,8 @@ template <int w> > when 'assume' silences warnings even with older GCCs. */ > # define assume(R) ((R) ? (void) 0 : __builtin_trap ()) > #else > -# define assume(R) ((void) (0 && (R))) > + /* Some tools grok NOTREACHED, e.g., Oracle Studio 12.6. */ > +# define assume(R) ((R) ? (void) 0 : /*NOTREACHED*/ (void) 0) > #endif > > /* @assert.h omit end@ */ As far as I know I would say nack. Frediano _______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/spice-devel