summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authornijtmans@users.sourceforge.net <jan.nijtmans>2012-06-15 07:43:50 (GMT)
committernijtmans@users.sourceforge.net <jan.nijtmans>2012-06-15 07:43:50 (GMT)
commit14f04b0ffccc38d3efc5f3c4c2549d5f5283393b (patch)
tree715df455674c1babbdd7db063187439b8143d64a /generic
parent53c1335f1905a69872465a33879f91caf18f861c (diff)
downloadtk-14f04b0ffccc38d3efc5f3c4c2549d5f5283393b.zip
tk-14f04b0ffccc38d3efc5f3c4c2549d5f5283393b.tar.gz
tk-14f04b0ffccc38d3efc5f3c4c2549d5f5283393b.tar.bz2
fix signature of XSynchronize to match X.org
Diffstat (limited to 'generic')
-rw-r--r--generic/tkInt.decls2
-rw-r--r--generic/tkIntXlibDecls.h8
-rw-r--r--generic/tkStubInit.c2
3 files changed, 7 insertions, 5 deletions
diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index 03353ed..822d008 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -1431,7 +1431,7 @@ declare 111 win {
int XNoOp(Display *display)
}
declare 112 win {
- int XSynchronize(Display *display, Bool onoff)
+ XAfterFunction XSynchronize(Display *display, Bool onoff)
}
declare 113 win {
int XSync(Display *display, Bool discard)
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index fd6eb36..5b0f267 100644
--- a/generic/tkIntXlibDecls.h
+++ b/generic/tkIntXlibDecls.h
@@ -30,6 +30,10 @@
#define TCL_STORAGE_CLASS DLLEXPORT
#endif
+typedef int (*XAfterFunction) ( /* WARNING, this type not in Xlib spec */
+ Display* /* display */
+);
+
/* !BEGIN!: Do not edit below this line. */
/*
@@ -343,7 +347,7 @@ EXTERN int XFree(void *data);
/* 111 */
EXTERN int XNoOp(Display *display);
/* 112 */
-EXTERN int XSynchronize(Display *display, Bool onoff);
+EXTERN XAfterFunction XSynchronize(Display *display, Bool onoff);
/* 113 */
EXTERN int XSync(Display *display, Bool discard);
/* 114 */
@@ -731,7 +735,7 @@ typedef struct TkIntXlibStubs {
int (*xUngrabServer) (Display *display); /* 109 */
int (*xFree) (void *data); /* 110 */
int (*xNoOp) (Display *display); /* 111 */
- int (*xSynchronize) (Display *display, Bool onoff); /* 112 */
+ XAfterFunction (*xSynchronize) (Display *display, Bool onoff); /* 112 */
int (*xSync) (Display *display, Bool discard); /* 113 */
VisualID (*xVisualIDFromVisual) (Visual *visual); /* 114 */
#endif /* WIN */
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index cb87a58..4bdc955 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -75,8 +75,6 @@ TkCreateXEventSource(void)
# ifdef __CYGWIN__
- TkIntStubs tkIntStubs;
-
/*
* Trick, so we don't have to include <windows.h> here, which in any
* case lacks this function anyway.