diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-04-08 07:52:43 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-04-08 07:52:43 (GMT) |
| commit | e87fb0843e828d44281ae4cb4c5a10565570e3a2 (patch) | |
| tree | 90799a7b2f4b7234b334f330b8d6caac5b824948 | |
| parent | 669eee25c1697b76b631701baf3a4c262c8c09fc (diff) | |
| parent | 38110bfa79a74f4bb8c5e0a122f1af517e537d50 (diff) | |
| download | tk-e87fb0843e828d44281ae4cb4c5a10565570e3a2.zip tk-e87fb0843e828d44281ae4cb4c5a10565570e3a2.tar.gz tk-e87fb0843e828d44281ae4cb4c5a10565570e3a2.tar.bz2 | |
Don't work around XkbOpenDisplay's non-const-ness with a macro, when there is only a single call. A type-cate suffices.
Merge-mark core-8-5-14, just to document that really all changes are merged back.
| -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 53e01ed..0cc3731 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 @@ -137,8 +134,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", |