summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-07 09:32:30 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-07 09:32:30 (GMT)
commit2240ad9def4214ab61204d7fb4d7e81868984a25 (patch)
treeb56d27ddc306175f1d344c47401a0d8cb8249615
parent3aa2c84455d3f19dcc554b7d45caa624f3f53e60 (diff)
parente05ce20958cb001bed972573c9e8b7bcc8d0904f (diff)
downloadtk-2240ad9def4214ab61204d7fb4d7e81868984a25.zip
tk-2240ad9def4214ab61204d7fb4d7e81868984a25.tar.gz
tk-2240ad9def4214ab61204d7fb4d7e81868984a25.tar.bz2
some quoting issues, eliminate TCL_VARARGS_DEFINE
-rw-r--r--win/Makefile.in10
-rw-r--r--win/stubs.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/win/Makefile.in b/win/Makefile.in
index 80c818c..bb63a3d 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -388,8 +388,8 @@ TTK_OBJS = \
STUB_OBJS = \
tkStubLib.$(OBJEXT) ttkStubLib.$(OBJEXT)
-TCL_DOCS = "$(TCL_SRC_DIR_NATIVE)"/doc/*.[13n]
-TK_DOCS = "$(ROOT_DIR_NATIVE)"/doc/*.[13n]
+TCL_DOCS = "$(TCL_SRC_DIR_NATIVE)/doc/*.[13n]"
+TK_DOCS = "$(ROOT_DIR_NATIVE)/doc/*.[13n]"
CORE_DOCS = $(TCL_DOCS) $(TK_DOCS)
DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
@@ -415,12 +415,12 @@ doc: $(ROOT_DIR)/doc/man.macros
winhelp: $(TCL_SRC_DIR_NATIVE)/tools/man2help.tcl $(MAN2TCL)
$(TCL_EXE) "$(TCL_SRC_DIR_NATIVE)/tools/man2help.tcl" tcl "$(VER)" $(CORE_DOCS)
- $(COPY) "$(TCL_BIN_DIR)"/tcl.hpj ./
+ $(COPY) "$(TCL_BIN_DIR)/tcl.hpj" ./
hcw /c /e tcl.hpj
- $(COPY) ./tcl$(VER).cnt ./TCL$(VER).HLP "$(TCL_SRC_DIR_NATIVE)"/tools/
+ $(COPY) ./tcl$(VER).cnt ./TCL$(VER).HLP "$(TCL_SRC_DIR_NATIVE)/tools/"
$(MAN2TCL): $(TCL_SRC_DIR_NATIVE)/tools/man2tcl.c
- $(CC) $(CFLAGS_OPTIMIZE) $(MAN2TCLFLAGS) -o $(MAN2TCL) "$(TCL_SRC_DIR_NATIVE)"/tools/man2tcl.c
+ $(CC) $(CFLAGS_OPTIMIZE) $(MAN2TCLFLAGS) -o $(MAN2TCL) "$(TCL_SRC_DIR_NATIVE)/tools/man2tcl.c"
# Specifying TESTFLAGS on the command line is the standard way to pass
# args to tcltest, ie:
diff --git a/win/stubs.c b/win/stubs.c
index bf72b72..4564639 100644
--- a/win/stubs.c
+++ b/win/stubs.c
@@ -64,7 +64,7 @@ XCreateGlyphCursor(
}
XIC
-XCreateIC TCL_VARARGS_DEF(XIM,xim)
+XCreateIC(XIM xim, ...)
{
return NULL;
}