fix for [Bug 3288345]: use _stat32i64 for CYGWIN too

fix a few more gcc warnings

4 files changed, 46 insertions, 39 deletions

diff --git a/generic/tcl.h b/generic/tcl.h
index 39db170..53dce4b 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -391,8 +391,12 @@ typedef struct _stat32i64 Tcl_StatBuf;
 #   elif defined(__GNUC__)
 #      define TCL_WIDE_INT_TYPE long long
 #      define TCL_LL_MODIFIER	"ll"
+#      if defined(__WIN32__)
+typedef struct _stat32i64 Tcl_StatBuf;
+#      else
 typedef struct stat	Tcl_StatBuf;
-#   else /* __WIN32__ */
+#      endif
+#   else /* ! __WIN32__ && ! __GNUC__ */
 /*
  * Don't know what platform it is and configure hasn't discovered what is
  * going on for us. Try to guess...
diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index 1f0e4a9..9294dd6 100644
--- a/generic/tclIOCmd.c
+++ b/generic/tclIOCmd.c
@@ -1948,25 +1948,25 @@ TclInitChanCmd(
      * function at the moment.
      */
     static const EnsembleImplMap initMap[] = {
-	{"blocked",	Tcl_FblockedObjCmd},
-	{"close",	Tcl_CloseObjCmd},
-	{"copy",	Tcl_FcopyObjCmd},
-	{"create",	TclChanCreateObjCmd},		/* TIP #219 */
-	{"eof",		Tcl_EofObjCmd},
-	{"event",	Tcl_FileEventObjCmd},
-	{"flush",	Tcl_FlushObjCmd},
-	{"gets",	Tcl_GetsObjCmd},
-	{"names",	TclChannelNamesCmd},
-	{"pending",	ChanPendingObjCmd},		/* TIP #287 */
-	{"pop",		TclChanPopObjCmd},		/* TIP #230 */
-	{"postevent",	TclChanPostEventObjCmd},	/* TIP #219 */
-	{"push",	TclChanPushObjCmd},		/* TIP #230 */
-	{"puts",	Tcl_PutsObjCmd},
-	{"read",	Tcl_ReadObjCmd},
-	{"seek",	Tcl_SeekObjCmd},
-	{"pipe",	ChanPipeObjCmd},		/* TIP #304 */
-	{"tell",	Tcl_TellObjCmd},
-	{"truncate",	ChanTruncateObjCmd},		/* TIP #208 */
+	{"blocked",	Tcl_FblockedObjCmd, NULL, NULL, NULL, 0},
+	{"close",	Tcl_CloseObjCmd, NULL, NULL, NULL, 0},
+	{"copy",	Tcl_FcopyObjCmd, NULL, NULL, NULL, 0},
+	{"create",	TclChanCreateObjCmd, NULL, NULL, NULL, 0},		/* TIP #219 */
+	{"eof",		Tcl_EofObjCmd, NULL, NULL, NULL, 0},
+	{"event",	Tcl_FileEventObjCmd, NULL, NULL, NULL, 0},
+	{"flush",	Tcl_FlushObjCmd, NULL, NULL, NULL, 0},
+	{"gets",	Tcl_GetsObjCmd, NULL, NULL, NULL, 0},
+	{"names",	TclChannelNamesCmd, NULL, NULL, NULL, 0},
+	{"pending",	ChanPendingObjCmd, NULL, NULL, NULL, 0},		/* TIP #287 */
+	{"pop",		TclChanPopObjCmd, NULL, NULL, NULL, 0},		/* TIP #230 */
+	{"postevent",	TclChanPostEventObjCmd, NULL, NULL, NULL, 0},	/* TIP #219 */
+	{"push",	TclChanPushObjCmd, NULL, NULL, NULL, 0},		/* TIP #230 */
+	{"puts",	Tcl_PutsObjCmd, NULL, NULL, NULL, 0},
+	{"read",	Tcl_ReadObjCmd, NULL, NULL, NULL, 0},
+	{"seek",	Tcl_SeekObjCmd, NULL, NULL, NULL, 0},
+	{"pipe",	ChanPipeObjCmd, NULL, NULL, NULL, 0},		/* TIP #304 */
+	{"tell",	Tcl_TellObjCmd, NULL, NULL, NULL, 0},
+	{"truncate",	ChanTruncateObjCmd, NULL, NULL, NULL, 0},		/* TIP #208 */
 	{NULL, NULL, NULL, NULL, NULL, 0}
     };
     static const char *const extras[] = {
diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c
index 7a09490..957b525 100644
--- a/generic/tclNamesp.c
+++ b/generic/tclNamesp.c
@@ -160,25 +160,25 @@ static const Tcl_ObjType nsNameType = {
  */
 
 static const EnsembleImplMap defaultNamespaceMap[] = {
-    {"children",        NamespaceChildrenCmd},
-    {"code",            NamespaceCodeCmd},
-    {"current",         NamespaceCurrentCmd},
-    {"delete",          NamespaceDeleteCmd},
-    {"ensemble",        TclNamespaceEnsembleCmd},
-    {"eval",            NamespaceEvalCmd,       NULL, NRNamespaceEvalCmd},
-    {"exists",          NamespaceExistsCmd},
-    {"export",          NamespaceExportCmd},
-    {"forget",          NamespaceForgetCmd},
-    {"import",          NamespaceImportCmd},
-    {"inscope",         NamespaceInscopeCmd,    NULL, NRNamespaceInscopeCmd},
-    {"origin",          NamespaceOriginCmd},
-    {"parent",          NamespaceParentCmd},
-    {"path",            NamespacePathCmd},
-    {"qualifiers",      NamespaceQualifiersCmd},
-    {"tail",            NamespaceTailCmd},
-    {"unknown",         NamespaceUnknownCmd},
-    {"upvar",           NamespaceUpvarCmd,      TclCompileNamespaceUpvarCmd},
-    {"which",           NamespaceWhichCmd},
+    {"children",        NamespaceChildrenCmd, NULL, NULL, NULL, 0},
+    {"code",            NamespaceCodeCmd, NULL, NULL, NULL, 0},
+    {"current",         NamespaceCurrentCmd, NULL, NULL, NULL, 0},
+    {"delete",          NamespaceDeleteCmd, NULL, NULL, NULL, 0},
+    {"ensemble",        TclNamespaceEnsembleCmd, NULL, NULL, NULL, 0},
+    {"eval",            NamespaceEvalCmd,       NULL, NRNamespaceEvalCmd, NULL, 0},
+    {"exists",          NamespaceExistsCmd, NULL, NULL, NULL, 0},
+    {"export",          NamespaceExportCmd, NULL, NULL, NULL, 0},
+    {"forget",          NamespaceForgetCmd, NULL, NULL, NULL, 0},
+    {"import",          NamespaceImportCmd, NULL, NULL, NULL, 0},
+    {"inscope",         NamespaceInscopeCmd,    NULL, NULL, NRNamespaceInscopeCmd, 0},
+    {"origin",          NamespaceOriginCmd, NULL, NULL, NULL, 0},
+    {"parent",          NamespaceParentCmd, NULL, NULL, NULL, 0},
+    {"path",            NamespacePathCmd, NULL, NULL, NULL, 0},
+    {"qualifiers",      NamespaceQualifiersCmd, NULL, NULL, NULL, 0},
+    {"tail",            NamespaceTailCmd, NULL, NULL, NULL, 0},
+    {"unknown",         NamespaceUnknownCmd, NULL, NULL, NULL, 0},
+    {"upvar",           NamespaceUpvarCmd,      TclCompileNamespaceUpvarCmd, NULL, NULL, 0},
+    {"which",           NamespaceWhichCmd, NULL, NULL, NULL, 0},
     {NULL, NULL, NULL, NULL, NULL, 0}
 };
 
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index a3e5830..4fe8754 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -83,6 +83,9 @@
 
 #ifdef __CYGWIN__
 #   include <unistd.h>
+#   ifndef _vsnprintf
+#	define _vsnprintf vsnprintf
+#   endif
 #   ifndef _wcsicmp
 #	define _wcsicmp wcscasecmp
 #   endif