diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2022-09-29 17:25:53 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2022-09-29 17:25:53 -0700 |
| commit | 9740bd9bfa75a858853f07b8c06dd813ef692778 (patch) | |
| tree | 09357498faafc763df6514cb4e0ac12747ced072 /include/X11/Xfuncproto.h | |
| parent | ae81c3c694b7cc0a810e55eb5d410dc8e7f55e21 (diff) | |
Remove _X_NONNULL macro
We could not find any evidence it was ever used, but defining it
caused C++11 compilers to complain:
/usr/X11R6/include/X11/Xfuncproto.h:173:24:
warning: ISO C does not permit named variadic macros [-Wvariadic-macros]
#define _X_NONNULL(args...) __attribute__((nonnull(args)))
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'include/X11/Xfuncproto.h')
| -rw-r--r-- | include/X11/Xfuncproto.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/include/X11/Xfuncproto.h b/include/X11/Xfuncproto.h index f689073..f78415e 100644 --- a/include/X11/Xfuncproto.h +++ b/include/X11/Xfuncproto.h @@ -163,19 +163,6 @@ in this Software without prior written authorization from The Open Group. # define _X_ATTRIBUTE_PRINTF(x,y) #endif -/* requires xproto >= 7.0.22 - since this uses either gcc or C99 variable - argument macros, must be only used inside #ifdef _X_NONNULL guards, as - many legacy X clients are compiled in C89 mode still. */ -#if __has_attribute(nonnull) \ - && defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */ -#define _X_NONNULL(...) __attribute__((nonnull(__VA_ARGS__))) -#elif __has_attribute(nonnull) \ - || defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303) -#define _X_NONNULL(args...) __attribute__((nonnull(args))) -#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */ -#define _X_NONNULL(...) /* */ -#endif - /* requires xproto >= 7.0.22 */ #if __has_attribute(__unused__) \ || defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205) |