summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjan.nijtmans <jan.nijtmans@noemail.net>2012-05-24 21:15:46 (GMT)
committerjan.nijtmans <jan.nijtmans@noemail.net>2012-05-24 21:15:46 (GMT)
commit668b781d3f1f94884719b36eff9d3e04c276afb0 (patch)
tree209933d2accf8feb64d481f548a0029cae195009 /win
parent5668666cb48b5738cf6cfb74b80ae1240f5ea191 (diff)
parent5228f1801569ac4b5a91362a71f20302b2f7b712 (diff)
downloadtk-668b781d3f1f94884719b36eff9d3e04c276afb0.zip
tk-668b781d3f1f94884719b36eff9d3e04c276afb0.tar.gz
tk-668b781d3f1f94884719b36eff9d3e04c276afb0.tar.bz2
Change XSetCommand signature to match Xorg, needed for Cygwin
FossilOrigin-Name: 4a5604149cb82977530a21972d1969429938d52e
Diffstat (limited to 'win')
-rw-r--r--win/Makefile.in6
-rw-r--r--win/stubs.c2
-rw-r--r--win/tkWinWm.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/win/Makefile.in b/win/Makefile.in
index 5f9fd46..7958e3c 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -705,7 +705,7 @@ $(GENERIC_DIR)/tkStubInit.c: $(GENERIC_DIR)/tk.decls \
@echo "This warning can be safely ignored, do not report as a bug!"
genstubs:
- $(TCL_EXE) "$(TCL_TOOL_DIR)\genStubs.tcl" \
+ $(TCL_EXE) "$(TCL_TOOL_DIR)/genStubs.tcl" \
"$(GENERIC_DIR_NATIVE)" \
- "$(GENERIC_DIR_NATIVE)\tk.decls" \
- "$(GENERIC_DIR_NATIVE)\tkInt.decls"
+ "$(GENERIC_DIR_NATIVE)/tk.decls" \
+ "$(GENERIC_DIR_NATIVE)/tkInt.decls"
diff --git a/win/stubs.c b/win/stubs.c
index 1138ccb..00030d1 100644
--- a/win/stubs.c
+++ b/win/stubs.c
@@ -252,7 +252,7 @@ void
XSetCommand(
Display *display,
Window w,
- CONST char **argv,
+ char **argv,
int argc)
{
}
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index bb7f746..e3816ca 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.c
@@ -3567,7 +3567,7 @@ WmCommandCmd(
wmPtr->cmdArgc = cmdArgc;
wmPtr->cmdArgv = cmdArgv;
if (!(wmPtr->flags & WM_NEVER_MAPPED)) {
- XSetCommand(winPtr->display, winPtr->window, cmdArgv, cmdArgc);
+ XSetCommand(winPtr->display, winPtr->window, (char **) cmdArgv, cmdArgc);
}
return TCL_OK;
}