some formatting (*.decls)

move up #undef, for macro which is conflicting with later stuff.
remove some unused cygwin-related code
some minor gcc warnings

13 files changed, 25 insertions, 66 deletions

diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index aed0022..9a23bd2 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -3275,7 +3275,7 @@ TclInitStringCmd(
 	{"trimright",	StringTrimRCmd,	NULL},
 	{"wordend",	StringEndCmd,	NULL},
 	{"wordstart",	StringStartCmd,	NULL},
-	{NULL}
+	{NULL, NULL, NULL}
     };
 
     return TclMakeEnsemble(interp, "string", stringImplMap);
diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index 9b23389..3c65be8 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.c
@@ -397,7 +397,7 @@ InstructionDesc tclInstructionTable[] = {
 	 * stknext */
     {"existStk",	 1,    0,         0,	{OPERAND_NONE}},
 	/* Test if general variable exists; unparsed variable name is stktop*/
-    {0}
+    {0, 0, 0, 0, {0}}
 };
 
 /*
diff --git a/generic/tclDictObj.c b/generic/tclDictObj.c
index 03c4d67..8f3ce3a 100644
--- a/generic/tclDictObj.c
+++ b/generic/tclDictObj.c
@@ -97,7 +97,7 @@ static const EnsembleImplMap implementationMap[] = {
     {"update",	DictUpdateCmd,	TclCompileDictUpdateCmd },
     {"values",	DictValuesCmd,	NULL },
     {"with",	DictWithCmd,	NULL },
-    {NULL}
+    {NULL, NULL, NULL}
 };
 
 /*
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index dc87d70..8d97392 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -153,7 +153,7 @@ static BuiltinFunc tclBuiltinFuncTable[] = {
     {"round", 1},
     {"srand", 1},
     {"wide", 1},
-    {0},
+    {NULL, 0},
 };
 
 #define LAST_BUILTIN_FUNC	25
diff --git a/generic/tclFileName.c b/generic/tclFileName.c
index 26587ee..1fca08b 100644
--- a/generic/tclFileName.c
+++ b/generic/tclFileName.c
@@ -2431,15 +2431,6 @@ DoGlob(
 		}
 	    }
 
-#if defined(__CYGWIN__) && defined(__WIN32__)
-	    {
-		char winbuf[MAX_PATH+1];
-
-		cygwin_conv_to_win32_path(Tcl_DStringValue(&append), winbuf);
-		Tcl_DStringFree(&append);
-		Tcl_DStringAppend(&append, winbuf, -1);
-	    }
-#endif /* __CYGWIN__ && __WIN32__ */
 	    break;
 
 	case TCL_PLATFORM_UNIX:
diff --git a/generic/tclIOSock.c b/generic/tclIOSock.c
index 7233646..e259676 100644
--- a/generic/tclIOSock.c
+++ b/generic/tclIOSock.c
@@ -83,7 +83,7 @@ TclSockGetPort(
 
 #undef TclSockMinimumBuffers
 #ifndef _WIN32
-#   define SOCKET int
+#   define SOCKET size_t
 #endif
 
 int
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index efdb457..09877a3 100644
--- a/generic/tclIOUtil.c
+++ b/generic/tclIOUtil.c
@@ -399,6 +399,7 @@ static FilesystemRecord nativeFilesystemRecord = {
     NULL,
     &tclNativeFilesystem,
     1,
+    NULL,
     NULL
 };
 
diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index ac2d84b..859f491 100644
--- a/generic/tclInt.decls
+++ b/generic/tclInt.decls
@@ -726,7 +726,7 @@ declare 177 {
 	    const char *operation, const char *reason)
 }
 declare 178 {
-    void Tcl_SetStartupScript(Tcl_Obj *pathPtr, const char* encodingName)
+    void Tcl_SetStartupScript(Tcl_Obj *pathPtr, const char *encodingName)
 }
 declare 179 {
     Tcl_Obj *Tcl_GetStartupScript(const char **encodingNamePtr)
@@ -932,8 +932,8 @@ declare 243 {
 }
 
 declare 249 {
-    char* TclDoubleDigits(double dv, int ndigits, int flags,
-			  int* decpt, int* signum, char** endPtr)
+    char *TclDoubleDigits(double dv, int ndigits, int flags,
+			  int *decpt, int *signum, char **endPtr)
 }
 
 ##############################################################################
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index 6be7f94..365f529 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -831,7 +831,7 @@ EXTERN void		TclVarErrMsg(Tcl_Interp *interp, CONST char *part1,
 #define Tcl_SetStartupScript_TCL_DECLARED
 /* 178 */
 EXTERN void		Tcl_SetStartupScript(Tcl_Obj *pathPtr,
-				CONST char*encodingName);
+				CONST char *encodingName);
 #endif
 #ifndef Tcl_GetStartupScript_TCL_DECLARED
 #define Tcl_GetStartupScript_TCL_DECLARED
@@ -1066,8 +1066,8 @@ EXTERN void		TclDbDumpActiveObjects(FILE *outFile);
 #ifndef TclDoubleDigits_TCL_DECLARED
 #define TclDoubleDigits_TCL_DECLARED
 /* 249 */
-EXTERN char*		TclDoubleDigits(double dv, int ndigits, int flags,
-				int*decpt, int*signum, char**endPtr);
+EXTERN char *		TclDoubleDigits(double dv, int ndigits, int flags,
+				int *decpt, int *signum, char **endPtr);
 #endif
 
 typedef struct TclIntStubs {
@@ -1260,7 +1260,7 @@ typedef struct TclIntStubs {
     int (*tclCallVarTraces) (Interp *iPtr, Var *arrayPtr, Var *varPtr, CONST char *part1, CONST char *part2, int flags, int leaveErrMsg); /* 175 */
     void (*tclCleanupVar) (Var *varPtr, Var *arrayPtr); /* 176 */
     void (*tclVarErrMsg) (Tcl_Interp *interp, CONST char *part1, CONST char *part2, CONST char *operation, CONST char *reason); /* 177 */
-    void (*tcl_SetStartupScript) (Tcl_Obj *pathPtr, CONST char*encodingName); /* 178 */
+    void (*tcl_SetStartupScript) (Tcl_Obj *pathPtr, CONST char *encodingName); /* 178 */
     Tcl_Obj * (*tcl_GetStartupScript) (CONST char **encodingNamePtr); /* 179 */
     VOID *reserved180;
     VOID *reserved181;
@@ -1331,7 +1331,7 @@ typedef struct TclIntStubs {
     VOID *reserved246;
     VOID *reserved247;
     VOID *reserved248;
-    char* (*tclDoubleDigits) (double dv, int ndigits, int flags, int*decpt, int*signum, char**endPtr); /* 249 */
+    char * (*tclDoubleDigits) (double dv, int ndigits, int flags, int *decpt, int *signum, char **endPtr); /* 249 */
 } TclIntStubs;
 
 #ifdef __cplusplus
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index 6a26b9f..b6f3205 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -2408,9 +2408,6 @@ SetFsPathFromAny(
     FsPath *fsPathPtr;
     Tcl_Obj *transPtr;
     char *name;
-#if defined(__CYGWIN__) && defined(__WIN32__)
-    int copied = 0;
-#endif
     ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&tclFsDataKey);
 
     if (pathPtr->typePtr == &tclFsPathType) {
@@ -2557,30 +2554,6 @@ SetFsPathFromAny(
 	pathPtr->refCount--;
     }
 
-#if defined(__CYGWIN__) && defined(__WIN32__)
-    {
-	char winbuf[MAX_PATH+1];
-
-	/*
-	 * In the Cygwin world, call conv_to_win32_path in order to use the
-	 * mount table to translate the file name into something Windows will
-	 * understand. Take care when converting empty strings!
-	 */
-
-	name = Tcl_GetStringFromObj(transPtr, &len);
-	if (len > 0) {
-	    cygwin_conv_to_win32_path(name, winbuf);
-	    TclWinNoBackslash(winbuf);
-	    if (Tcl_IsShared(transPtr)) {
-		copied = 1;
-		transPtr = Tcl_DuplicateObj(transPtr);
-		Tcl_IncrRefCount(transPtr);
-	    }
-	    Tcl_SetStringObj(transPtr, winbuf, -1);
-	}
-    }
-#endif /* __CYGWIN__ && __WIN32__ */
-
     /*
      * Now we have a translated filename in 'transPtr'. This will have forward
      * slashes on Windows, and will not contain any ~user sequences.
@@ -2606,12 +2579,6 @@ SetFsPathFromAny(
     SETPATHOBJ(pathPtr, fsPathPtr);
     PATHFLAGS(pathPtr) = 0;
     pathPtr->typePtr = &tclFsPathType;
-#if defined(__CYGWIN__) && defined(__WIN32__)
-    if (copied) {
-	Tcl_DecrRefCount(transPtr);
-    }
-#endif
-
     return TCL_OK;
 }
 
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index e6f95b4..65b7db0 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -31,6 +31,7 @@
 #undef Tcl_ValidateAllMemory
 #undef Tcl_FindHashEntry
 #undef Tcl_CreateHashEntry
+#undef TclSockMinimumBuffers
 
 /*
  * Keep a record of the original Notifier procedures, created in the
@@ -59,12 +60,11 @@ Tcl_NotifierProcs tclOriginalNotifier = {
 #ifdef _WIN64
 #   define TclSockMinimumBuffersOld 0
 #else
-#undef TclSockMinimumBuffers
 int TclSockMinimumBuffersOld(sock, size)
     int sock;
     int size;
 {
-    return TclSockMinimumBuffers((void *) (size_t) sock, size);
+    return TclSockMinimumBuffers(INT2PTR(sock), size);
 }
 #endif
 
diff --git a/generic/tclTomMath.decls b/generic/tclTomMath.decls
index 191312f..1bfc443 100644
--- a/generic/tclTomMath.decls
+++ b/generic/tclTomMath.decls
@@ -212,11 +212,11 @@ declare 60 generic {
     int TclBN_s_mp_sub(mp_int *a, mp_int *b, mp_int *c)
 }
 declare 61 {
-    int TclBN_mp_init_set_int(mp_int* a, unsigned long i)
+    int TclBN_mp_init_set_int(mp_int *a, unsigned long i)
 }
 declare 62 {
-    int TclBN_mp_set_int(mp_int* a, unsigned long i)
+    int TclBN_mp_set_int(mp_int *a, unsigned long i)
 }
 declare 63 {
-    int TclBN_mp_cnt_lsb(mp_int* a)
+    int TclBN_mp_cnt_lsb(mp_int *a)
 }
diff --git a/generic/tclTomMathDecls.h b/generic/tclTomMathDecls.h
index 4d5515b..04a23f3 100644
--- a/generic/tclTomMathDecls.h
+++ b/generic/tclTomMathDecls.h
@@ -455,17 +455,17 @@ EXTERN int		TclBN_s_mp_sub(mp_int *a, mp_int *b, mp_int *c);
 #ifndef TclBN_mp_init_set_int_TCL_DECLARED
 #define TclBN_mp_init_set_int_TCL_DECLARED
 /* 61 */
-EXTERN int		TclBN_mp_init_set_int(mp_int*a, unsigned long i);
+EXTERN int		TclBN_mp_init_set_int(mp_int *a, unsigned long i);
 #endif
 #ifndef TclBN_mp_set_int_TCL_DECLARED
 #define TclBN_mp_set_int_TCL_DECLARED
 /* 62 */
-EXTERN int		TclBN_mp_set_int(mp_int*a, unsigned long i);
+EXTERN int		TclBN_mp_set_int(mp_int *a, unsigned long i);
 #endif
 #ifndef TclBN_mp_cnt_lsb_TCL_DECLARED
 #define TclBN_mp_cnt_lsb_TCL_DECLARED
 /* 63 */
-EXTERN int		TclBN_mp_cnt_lsb(mp_int*a);
+EXTERN int		TclBN_mp_cnt_lsb(mp_int *a);
 #endif
 
 typedef struct TclTomMathStubs {
@@ -533,9 +533,9 @@ typedef struct TclTomMathStubs {
     int (*tclBN_s_mp_mul_digs) (mp_int *a, mp_int *b, mp_int *c, int digs); /* 58 */
     int (*tclBN_s_mp_sqr) (mp_int *a, mp_int *b); /* 59 */
     int (*tclBN_s_mp_sub) (mp_int *a, mp_int *b, mp_int *c); /* 60 */
-    int (*tclBN_mp_init_set_int) (mp_int*a, unsigned long i); /* 61 */
-    int (*tclBN_mp_set_int) (mp_int*a, unsigned long i); /* 62 */
-    int (*tclBN_mp_cnt_lsb) (mp_int*a); /* 63 */
+    int (*tclBN_mp_init_set_int) (mp_int *a, unsigned long i); /* 61 */
+    int (*tclBN_mp_set_int) (mp_int *a, unsigned long i); /* 62 */
+    int (*tclBN_mp_cnt_lsb) (mp_int *a); /* 63 */
 } TclTomMathStubs;
 
 #ifdef __cplusplus