diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2022-02-07 06:57:44 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2022-02-07 06:57:44 +0100 |
| commit | 6ffaa52cf732a84c0f8259dbc9b8183960ec5c33 (patch) | |
| tree | d3136c22e3e805cfc0efe78412cce905a17e0c8d /lib/arg-nonnull.h | |
| parent | 591cbf5878b7d4105b275585b9db1324c9dfce56 (diff) | |
| parent | af151c593704a40e10efb28d1e3dd59a23a661f3 (diff) | |
Merge branch 'release/debian/1.0-1'debian/1.0-1
Diffstat (limited to 'lib/arg-nonnull.h')
| -rw-r--r-- | lib/arg-nonnull.h | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/lib/arg-nonnull.h b/lib/arg-nonnull.h index b0318f3..e4513ef 100644 --- a/lib/arg-nonnull.h +++ b/lib/arg-nonnull.h @@ -1,20 +1,11 @@ /* A C macro for declaring that specific arguments must not be NULL. - Copyright (C) 2009-2018 Free Software Foundation, Inc. + Copyright (C) 2009-2022 Free Software Foundation, Inc. - This program is free software: you can redistribute it and/or - modify it under the terms of either: + 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 of the License, or + (at your option) any later version. - * the GNU Lesser General Public License as published by the Free - Software Foundation; either version 3 of the License, or (at your - option) any later version. - - or - - * the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your - option) any later version. - - or both in parallel, as here. 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 @@ -27,7 +18,7 @@ that the values passed as arguments n, ..., m must be non-NULL pointers. n = 1 stands for the first argument, n = 2 for the second argument etc. */ #ifndef _GL_ARG_NONNULL -# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3 +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || defined __clang__ # define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params)) # else # define _GL_ARG_NONNULL(params) |