Module Name: xsrc
Committed By: mrg
Date: Mon Jun 19 04:36:05 UTC 2023
Modified Files:
xsrc/external/mit/xorgproto/dist/include/X11: Xfuncproto.h
Log Message:
merge xorgproto 2023.02
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xorgproto/dist/include/X11/Xfuncproto.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorgproto/dist/include/X11/Xfuncproto.h
diff -u xsrc/external/mit/xorgproto/dist/include/X11/Xfuncproto.h:1.2 xsrc/external/mit/xorgproto/dist/include/X11/Xfuncproto.h:1.3
--- xsrc/external/mit/xorgproto/dist/include/X11/Xfuncproto.h:1.2 Sun May 9 16:13:39 2021
+++ xsrc/external/mit/xorgproto/dist/include/X11/Xfuncproto.h Mon Jun 19 04:36:05 2023
@@ -163,19 +163,6 @@ in this Software without prior written a
# 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)
