diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-12-12 15:27:10 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-12-12 15:27:10 (GMT) |
| commit | a71e712859d7f6c9977360f11e274472cfb0633f (patch) | |
| tree | 5a030360e81f889805ea22a4239814773660b9a6 /xlib | |
| parent | bfa1a81d06b89109eada1e4d5b0b8b26df818ab3 (diff) | |
| parent | 8587ab4815ee46a0bd52b89ac7200899fe484348 (diff) | |
| download | tk-a71e712859d7f6c9977360f11e274472cfb0633f.zip tk-a71e712859d7f6c9977360f11e274472cfb0633f.tar.gz tk-a71e712859d7f6c9977360f11e274472cfb0633f.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'xlib')
| -rw-r--r-- | xlib/X11/Sunkeysym.h | 2 | ||||
| -rw-r--r-- | xlib/X11/Xfuncproto.h | 13 | ||||
| -rw-r--r-- | xlib/X11/Xutil.h | 4 | ||||
| -rw-r--r-- | xlib/X11/keysymdef.h | 15 |
4 files changed, 13 insertions, 21 deletions
diff --git a/xlib/X11/Sunkeysym.h b/xlib/X11/Sunkeysym.h index 78d1286..149740b 100644 --- a/xlib/X11/Sunkeysym.h +++ b/xlib/X11/Sunkeysym.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1991, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1991, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/xlib/X11/Xfuncproto.h b/xlib/X11/Xfuncproto.h index f689073..f78415e 100644 --- a/xlib/X11/Xfuncproto.h +++ b/xlib/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) diff --git a/xlib/X11/Xutil.h b/xlib/X11/Xutil.h index 6a22c97..51e7cbc 100644 --- a/xlib/X11/Xutil.h +++ b/xlib/X11/Xutil.h @@ -418,11 +418,11 @@ EXTERN int XDestroyRegion( Region /* r */ ); -EXTERN int XEmptyRegion( +EXTERN Bool XEmptyRegion( Region /* r */ ); -EXTERN int XEqualRegion( +EXTERN Bool XEqualRegion( Region /* r1 */, Region /* r2 */ ); diff --git a/xlib/X11/keysymdef.h b/xlib/X11/keysymdef.h index 0f031ba..f614e30 100644 --- a/xlib/X11/keysymdef.h +++ b/xlib/X11/keysymdef.h @@ -431,8 +431,10 @@ SOFTWARE. #define XK_dead_O 0xfe87 #define XK_dead_u 0xfe88 #define XK_dead_U 0xfe89 -#define XK_dead_small_schwa 0xfe8a -#define XK_dead_capital_schwa 0xfe8b +#define XK_dead_schwa 0xfe8a +#define XK_dead_SCHWA 0xfe8b +#define XK_dead_small_schwa 0xfe8a /* deprecated, remove in 2025 */ +#define XK_dead_capital_schwa 0xfe8b /* deprecated, remove in 2025 */ #define XK_dead_greek 0xfe8c @@ -650,7 +652,8 @@ SOFTWARE. #define XK_diaeresis 0x00a8 /* U+00A8 DIAERESIS */ #define XK_copyright 0x00a9 /* U+00A9 COPYRIGHT SIGN */ #define XK_ordfeminine 0x00aa /* U+00AA FEMININE ORDINAL INDICATOR */ -#define XK_guillemotleft 0x00ab /* U+00AB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */ +#define XK_guillemetleft 0x00ab /* U+00AB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */ +#define XK_guillemotleft 0x00ab /* deprecated misspelling */ #define XK_notsign 0x00ac /* U+00AC NOT SIGN */ #define XK_hyphen 0x00ad /* U+00AD SOFT HYPHEN */ #define XK_registered 0x00ae /* U+00AE REGISTERED SIGN */ @@ -665,8 +668,10 @@ SOFTWARE. #define XK_periodcentered 0x00b7 /* U+00B7 MIDDLE DOT */ #define XK_cedilla 0x00b8 /* U+00B8 CEDILLA */ #define XK_onesuperior 0x00b9 /* U+00B9 SUPERSCRIPT ONE */ -#define XK_masculine 0x00ba /* U+00BA MASCULINE ORDINAL INDICATOR */ -#define XK_guillemotright 0x00bb /* U+00BB RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */ +#define XK_ordmasculine 0x00ba /* U+00BA MASCULINE ORDINAL INDICATOR */ +#define XK_masculine 0x00ba /* deprecated inconsistent name */ +#define XK_guillemetright 0x00bb /* U+00BB RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */ +#define XK_guillemotright 0x00bb /* deprecated misspelling */ #define XK_onequarter 0x00bc /* U+00BC VULGAR FRACTION ONE QUARTER */ #define XK_onehalf 0x00bd /* U+00BD VULGAR FRACTION ONE HALF */ #define XK_threequarters 0x00be /* U+00BE VULGAR FRACTION THREE QUARTERS */ |