summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--generic/tcl.h6
-rw-r--r--generic/tclIORTrans.c2
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index b9e05f8..ab40da6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-07 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * generic/tcl.h: Fix gcc warnings (discovered with
+ * generic/tclIORChan.c: latest mingw, based on gcc 4.6.1)
+
2011-10-06 Donal K. Fellows <dkf@users.sf.net>
* generic/tclDictObj.c (TclDictWithInit, TclDictWithFinish):
diff --git a/generic/tcl.h b/generic/tcl.h
index 7a94956..1bc3a89 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2276,12 +2276,12 @@ typedef int (Tcl_ArgvGenFuncProc)(ClientData clientData, Tcl_Interp *interp,
#define TCL_ARGV_AUTO_HELP \
{TCL_ARGV_HELP, "-help", NULL, NULL, \
- "Print summary of command-line options and abort"}
+ "Print summary of command-line options and abort", NULL}
#define TCL_ARGV_AUTO_REST \
{TCL_ARGV_REST, "--", NULL, NULL, \
- "Marks the end of the options"}
+ "Marks the end of the options", NULL}
#define TCL_ARGV_TABLE_END \
- {TCL_ARGV_END}
+ {TCL_ARGV_END, NULL, NULL, NULL, NULL, NULL}
/*
*----------------------------------------------------------------------------
diff --git a/generic/tclIORTrans.c b/generic/tclIORTrans.c
index b095dcf..6c9a41b 100644
--- a/generic/tclIORTrans.c
+++ b/generic/tclIORTrans.c
@@ -885,7 +885,7 @@ ReflectClose(
{
ReflectedTransform *rtPtr = clientData;
int errorCode, errorCodeSet = 0;
- int result; /* Result code for 'close' */
+ int result = TCL_OK; /* Result code for 'close' */
Tcl_Obj *resObj; /* Result data for 'close' */
ReflectedTransformMap *rtmPtr;
/* Map of reflected transforms with handlers