From 8aaaa90ec748d85170eb507c7f563223493c3471 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Tue, 11 Feb 2014 11:39:43 +0000 Subject: Fix for [f476e3d654]: Tk trunk fails to build/link --- generic/tkStubInit.c | 1 + 1 file changed, 1 insertion(+) diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index 47288c6..5a3e1ce 100644 --- a/generic/tkStubInit.c +++ b/generic/tkStubInit.c @@ -31,6 +31,7 @@ #include "tkIntXlibDecls.h" static const TkIntStubs tkIntStubs; +MODULE_SCOPE const TkStubs tkStubs; /* * Remove macro that might interfere with the definition below. -- cgit v0.12 From 138b9ce4b8717760fa2f26dea9f1d59de57886c9 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Tue, 11 Feb 2014 11:52:39 +0000 Subject: Fix [52ca3e7f55]: XkbOpenDisplay macro incorrect when HAVE_XKBKEYCODETOKEYSYM is not defined --- unix/tkUnixEvent.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unix/tkUnixEvent.c b/unix/tkUnixEvent.c index 0cc3731..eb83474 100644 --- a/unix/tkUnixEvent.c +++ b/unix/tkUnixEvent.c @@ -15,7 +15,7 @@ #ifdef HAVE_XKBKEYCODETOKEYSYM # include #else -# define XkbOpenDisplay(D,V,E,M,m,R) (V),(E),(M),(m),(R),(NULL) +# define XkbOpenDisplay(D,V,E,M,m,R) ((V),(E),(M),(m),(R),(NULL)) #endif /* -- cgit v0.12