diff options
| author | dgp <dgp@users.sourceforge.net> | 2013-04-01 17:07:10 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2013-04-01 17:07:10 (GMT) |
| commit | d81f8f7c49270ddc93b4d639c0e7f77767c4fd47 (patch) | |
| tree | 64da754277b242dc50862f735d5b4ee523971fa6 /unix/tkUnixEvent.c | |
| parent | e19cf65c7641a093a5c7cf8325c5466e431d7c69 (diff) | |
| parent | b8f8082aad49088238582658c22248f9469ad055 (diff) | |
| download | tk-d81f8f7c49270ddc93b4d639c0e7f77767c4fd47.zip tk-d81f8f7c49270ddc93b4d639c0e7f77767c4fd47.tar.gz tk-d81f8f7c49270ddc93b4d639c0e7f77767c4fd47.tar.bz2 | |
Merge 8.5. Bring together the compile time and run time Xkb checks.bug_3607830
Diffstat (limited to 'unix/tkUnixEvent.c')
| -rw-r--r-- | unix/tkUnixEvent.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/unix/tkUnixEvent.c b/unix/tkUnixEvent.c index 5e5374a..64a76f6 100644 --- a/unix/tkUnixEvent.c +++ b/unix/tkUnixEvent.c @@ -12,7 +12,14 @@ #include "tkUnixInt.h" #include <signal.h> -#include <X11/XKBlib.h> +#ifdef HAVE_XKBKEYCODETOKEYSYM +# include <X11/XKBlib.h> +/* Work around stupid un-const-ified Xkb headers. Grrrrr.... */ +# define XkbOpenDisplay(D,V,E,M,m,R) \ + (XkbOpenDisplay)((char *)(D),(V),(E),(M),(m),(R)) +#else +# define XkbOpenDisplay(D,V,E,M,m,R) (NULL) +#endif /* * The following static indicates whether this module has been initialized in |