diff options
| author | dgp <dgp@users.sourceforge.net> | 2020-10-03 19:54:56 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2020-10-03 19:54:56 (GMT) |
| commit | 4a1bb2bf6ed0b0c05e67c02714d12dc9e8ffd79f (patch) | |
| tree | 2b65c3317686c9d2190d80ce1e9a90c4c9c7c8da /unix | |
| parent | 6be4580181fce8ac6f220d01e3d6f6fea6bbe284 (diff) | |
| parent | 30699869c5cf8459e81c4bcedbe819d6887a02cb (diff) | |
| download | tk-4a1bb2bf6ed0b0c05e67c02714d12dc9e8ffd79f.zip tk-4a1bb2bf6ed0b0c05e67c02714d12dc9e8ffd79f.tar.gz tk-4a1bb2bf6ed0b0c05e67c02714d12dc9e8ffd79f.tar.bz2 | |
merge 8.6
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tkUnix.c | 2 | ||||
| -rw-r--r-- | unix/tkUnixKey.c | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/unix/tkUnix.c b/unix/tkUnix.c index c6fff82..2de6e98 100644 --- a/unix/tkUnix.c +++ b/unix/tkUnix.c @@ -16,7 +16,7 @@ # include <X11/extensions/scrnsaver.h> # ifdef __APPLE__ /* Support for weak-linked libXss. */ -# define HaveXSSLibrary() (XScreenSaverQueryInfo != NULL) +# define HaveXSSLibrary() (&XScreenSaverQueryInfo != NULL) # else /* Other platforms always link libXss. */ # define HaveXSSLibrary() (1) diff --git a/unix/tkUnixKey.c b/unix/tkUnixKey.c index 4e150f7..d55fde0 100644 --- a/unix/tkUnixKey.c +++ b/unix/tkUnixKey.c @@ -12,6 +12,13 @@ #include "tkInt.h" +#ifdef __GNUC__ +/* + * We know that XKeycodeToKeysym is deprecated, nothing we can do about it. + */ +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + /* ** Bug [3607830]: Before using Xkb, it must be initialized. TkpOpenDisplay ** does this and sets the USE_XKB flag if xkb is supported. |