Tk Source Code

Check-in [43d0360d]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:silence compiler warning
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 43d0360d39104671fa9994551b052dfb89ac2813
User & Date: dgp 2013-04-01 17:53:52
Context
2013-04-03
13:53
merge-mark check-in: d1122c1d user: dgp tags: trunk
2013-04-01
17:53
silence compiler warning check-in: 43d0360d user: dgp tags: trunk
17:53
silence compiler warning check-in: 62d32367 user: dgp tags: core-8-5-branch
17:50
3607830 Runtime checks that Xkb is available in the X server before trying to use. Adapted from patch from Brian Griffin. check-in: a2433152 user: dgp tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to unix/tkUnixEvent.c.

14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
#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) (NULL)
#endif

/*
 * The following static indicates whether this module has been initialized in
 * the current thread.
 */








|







14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
#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

/*
 * The following static indicates whether this module has been initialized in
 * the current thread.
 */