summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--generic/tkInt.decls2
-rw-r--r--generic/tkIntXlibDecls.h8
-rw-r--r--generic/tkStubInit.c2
-rw-r--r--unix/tkUnixPort.h4
-rw-r--r--win/Makefile.in2
-rw-r--r--win/stubs.c4
6 files changed, 14 insertions, 8 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.
diff --git a/unix/tkUnixPort.h b/unix/tkUnixPort.h
index 331a6e5..222be88 100644
--- a/unix/tkUnixPort.h
+++ b/unix/tkUnixPort.h
@@ -126,6 +126,10 @@
# define WPARAM void *
# define LPARAM void *
# define LRESULT void *
+
+EXTERN int TkPutImage (unsigned long *, int, Display *, Drawable, GC,
+ XImage *, int, int, int, int, unsigned int, unsigned int);
+
#else /* !__CYGWIN__ */
/*
* The TkPutImage macro strips off the color table information, which isn't
diff --git a/win/Makefile.in b/win/Makefile.in
index 89f57bc..35261b5 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -478,7 +478,7 @@ install-binaries: binaries
@echo "Creating package index $(PKG_INDEX)";
@$(RM) $(PKG_INDEX);
@(\
- echo "if {[catch {package present Tcl $(TCLVERSION)$(TCLPATCHL)}]} { return }";\
+ echo "if {[catch {package present Tcl $(TCLVERSION)$(TCLPATCHL)}]} return";\
echo "if {(\$$::tcl_platform(platform) eq \"unix\")";\
echo " && ([info exists ::env(DISPLAY)] || [lsearch -exact \$$::argv -display] > -1)} {";\
echo " package ifneeded Tk $(VERSION)$(PATCH_LEVEL) [list load [file join \$$dir .. .. bin libtk$(VERSION).dll] Tk]";\
diff --git a/win/stubs.c b/win/stubs.c
index 0940752..1cf23ef 100644
--- a/win/stubs.c
+++ b/win/stubs.c
@@ -448,13 +448,13 @@ XNoOp(
return 0;
}
-int
+XAfterFunction
XSynchronize(
Display *display,
Bool bool)
{
display->request++;
- return 0;
+ return NULL;
}
int