diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2014-02-11 14:27:03 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2014-02-11 14:27:03 (GMT) |
| commit | 46c0d57c9dddb7eec969f3ca3a8eedb7ae594d6f (patch) | |
| tree | e4e952a4e8e75b1f15e25f00c61074d1cf37822f | |
| parent | 39f68dd8ff7613cc944ecf8be81acba0f8312f2d (diff) | |
| parent | c4b524022a0c010fdc0d526a4297b54d77420ba4 (diff) | |
| download | tk-46c0d57c9dddb7eec969f3ca3a8eedb7ae594d6f.zip tk-46c0d57c9dddb7eec969f3ca3a8eedb7ae594d6f.tar.gz tk-46c0d57c9dddb7eec969f3ca3a8eedb7ae594d6f.tar.bz2 | |
merge trunk
| -rw-r--r-- | generic/tkStubInit.c | 1 | ||||
| -rw-r--r-- | unix/tkUnixEvent.c | 2 |
2 files changed, 2 insertions, 1 deletions
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. diff --git a/unix/tkUnixEvent.c b/unix/tkUnixEvent.c index 9a29f51..f3beb16 100644 --- a/unix/tkUnixEvent.c +++ b/unix/tkUnixEvent.c @@ -15,7 +15,7 @@ #ifdef HAVE_XKBKEYCODETOKEYSYM # include <X11/XKBlib.h> #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 /* |