diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-04-08 07:57:13 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-04-08 07:57:13 (GMT) |
| commit | 608051e86eb6aed0bf086ded4c74390e91a767c3 (patch) | |
| tree | 1a90ac384decb48a4e530f90f3fecd7d8536b648 | |
| parent | c61da5d0e488d415fe8f7c67cea9aa5f80d24777 (diff) | |
| parent | 7aee8ed2b10f0405745287f078b14e3ddf7a0367 (diff) | |
| download | tk-608051e86eb6aed0bf086ded4c74390e91a767c3.zip tk-608051e86eb6aed0bf086ded4c74390e91a767c3.tar.gz tk-608051e86eb6aed0bf086ded4c74390e91a767c3.tar.bz2 | |
Don't work around XkbOpenDisplay's non-const-ness with a macro, when there is only a single call. A type-cast suffices.
| -rw-r--r-- | unix/tkUnixEvent.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/unix/tkUnixEvent.c b/unix/tkUnixEvent.c index afb3db0..9b32502 100644 --- a/unix/tkUnixEvent.c +++ b/unix/tkUnixEvent.c @@ -14,9 +14,6 @@ #include <signal.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) (V),(E),(M),(m),(R),(NULL) #endif @@ -153,8 +150,11 @@ TkpOpenDisplay( ** that the serve supports it. The XkbOpenDisplay call ** will perform this check and return NULL if the extension ** is not supported. + ** + ** Work around un-const-ified Xkb headers using (char *) cast. */ - display = XkbOpenDisplay(displayNameStr, &event, &error, &major, &minor, &reason); + display = XkbOpenDisplay((char *)displayNameStr, &event, &error, &major, + &minor, &reason); if (display == NULL) { /*fprintf(stderr,"event=%d error=%d major=%d minor=%d reason=%d\nDisabling xkb\n", |