diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-04-01 19:15:13 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-04-01 19:15:13 (GMT) |
| commit | ac700071228681cf1b8227258dc7d6e5a9982899 (patch) | |
| tree | 1142f4902d53b04c460fe68eeb8778ce4a1554ac /unix/tkUnixKey.c | |
| parent | c5a38f8dee64da2d1d20ee4f95fdc0a91d5617e9 (diff) | |
| download | tk-ac700071228681cf1b8227258dc7d6e5a9982899.zip tk-ac700071228681cf1b8227258dc7d6e5a9982899.tar.gz tk-ac700071228681cf1b8227258dc7d6e5a9982899.tar.bz2 | |
CONSTify function XkbOpenDisplay(), and resolve conflict with definition in X11
Diffstat (limited to 'unix/tkUnixKey.c')
| -rw-r--r-- | unix/tkUnixKey.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/unix/tkUnixKey.c b/unix/tkUnixKey.c index c978294..1a5cb7d 100644 --- a/unix/tkUnixKey.c +++ b/unix/tkUnixKey.c @@ -13,7 +13,9 @@ #include "tkInt.h" #undef register /* Keyword "register" is used in XKBlib.h, so don't try tricky things here */ +#define XkbOpenDisplay XkbOpenDisplay_ /* Move out of the way, conflicting definitions */ #include <X11/XKBlib.h> +#undef XkbOpenDisplay /* * Prototypes for local functions defined in this file: |