tclpGetPid signature change (stub entry only, not for macro),

for win64 compatibility with future cygwin64
correctly use win32 as default when cross-compiling under cygwin

11 files changed, 9 insertions, 9 deletions

diff --git a/generic/tcl.decls b/generic/tcl.decls
index a061c76..a061c76 100644..100755
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
diff --git a/generic/tcl.h b/generic/tcl.h
index 3c6ef5e..3c6ef5e 100644..100755
--- a/generic/tcl.h
+++ b/generic/tcl.h
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c
index 63d9111..63d9111 100644..100755
--- a/generic/tclCmdAH.c
+++ b/generic/tclCmdAH.c
diff --git a/generic/tclEnv.c b/generic/tclEnv.c
index deb5dcd..deb5dcd 100644..100755
--- a/generic/tclEnv.c
+++ b/generic/tclEnv.c
diff --git a/generic/tclFCmd.c b/generic/tclFCmd.c
index 3d6a169..3d6a169 100644..100755
--- a/generic/tclFCmd.c
+++ b/generic/tclFCmd.c
diff --git a/generic/tclFileName.c b/generic/tclFileName.c
index c70bed5..c70bed5 100644..100755
--- a/generic/tclFileName.c
+++ b/generic/tclFileName.c
diff --git a/generic/tclIOSock.c b/generic/tclIOSock.c
index 159f3da..159f3da 100644..100755
--- a/generic/tclIOSock.c
+++ b/generic/tclIOSock.c
diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index b7c7ee4..e438588 100644..100755
--- a/generic/tclInt.decls
+++ b/generic/tclInt.decls
@@ -856,7 +856,7 @@ declare 7 win {
 	    const char *optval, int optlen)
 }
 declare 8 win {
-    unsigned long TclpGetPid(Tcl_Pid pid)
+    int TclpGetPid(Tcl_Pid pid)
 }
 declare 9 win {
     int TclWinGetPlatformId(void)
@@ -980,7 +980,7 @@ declare 7 unix {
 }
 # On non-cygwin, this is actually a reference to TclUnixWaitForFile
 declare 8 unix {
-    unsigned long TclpGetPid(Tcl_Pid pid)
+    int TclpGetPid(Tcl_Pid pid)
 }
 
 # Added in 8.1:
diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h
index 50c546c..6d3ed94 100644
--- a/generic/tclIntPlatDecls.h
+++ b/generic/tclIntPlatDecls.h
@@ -48,7 +48,7 @@ EXTERN unsigned short	TclWinNToHS _ANSI_ARGS_((unsigned short ns));
 EXTERN int		TclWinSetSockOpt _ANSI_ARGS_((VOID *s, int level,
 				int optname, CONST char *optval, int optlen));
 /* 8 */
-EXTERN unsigned long	TclpGetPid _ANSI_ARGS_((Tcl_Pid pid));
+EXTERN int		TclpGetPid _ANSI_ARGS_((Tcl_Pid pid));
 /* 9 */
 EXTERN int		TclWinGetPlatformId _ANSI_ARGS_((void));
 /* 10 */
@@ -137,7 +137,7 @@ EXTERN u_short		TclWinNToHS _ANSI_ARGS_((u_short ns));
 EXTERN int		TclWinSetSockOpt _ANSI_ARGS_((SOCKET s, int level,
 				int optname, CONST char *optval, int optlen));
 /* 8 */
-EXTERN unsigned long	TclpGetPid _ANSI_ARGS_((Tcl_Pid pid));
+EXTERN int		TclpGetPid _ANSI_ARGS_((Tcl_Pid pid));
 /* 9 */
 EXTERN int		TclWinGetPlatformId _ANSI_ARGS_((void));
 /* Slot 10 is reserved */
@@ -273,7 +273,7 @@ typedef struct TclIntPlatStubs {
     VOID *reserved5;
     unsigned short (*tclWinNToHS) _ANSI_ARGS_((unsigned short ns)); /* 6 */
     int (*tclWinSetSockOpt) _ANSI_ARGS_((VOID *s, int level, int optname, CONST char *optval, int optlen)); /* 7 */
-    unsigned long (*tclpGetPid) _ANSI_ARGS_((Tcl_Pid pid)); /* 8 */
+    int (*tclpGetPid) _ANSI_ARGS_((Tcl_Pid pid)); /* 8 */
     int (*tclWinGetPlatformId) _ANSI_ARGS_((void)); /* 9 */
     Tcl_DirEntry * (*tclpReaddir) _ANSI_ARGS_((DIR *dir)); /* 10 */
     struct tm * (*tclpLocaltime_unix) _ANSI_ARGS_((TclpTime_t_CONST clock)); /* 11 */
@@ -314,7 +314,7 @@ typedef struct TclIntPlatStubs {
     VOID *reserved5;
     u_short (*tclWinNToHS) _ANSI_ARGS_((u_short ns)); /* 6 */
     int (*tclWinSetSockOpt) _ANSI_ARGS_((SOCKET s, int level, int optname, CONST char *optval, int optlen)); /* 7 */
-    unsigned long (*tclpGetPid) _ANSI_ARGS_((Tcl_Pid pid)); /* 8 */
+    int (*tclpGetPid) _ANSI_ARGS_((Tcl_Pid pid)); /* 8 */
     int (*tclWinGetPlatformId) _ANSI_ARGS_((void)); /* 9 */
     VOID *reserved10;
     void (*tclGetAndDetachPids) _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Channel chan)); /* 11 */
diff --git a/generic/tclPipe.c b/generic/tclPipe.c
index 1042e09..6e7029e 100644..100755
--- a/generic/tclPipe.c
+++ b/generic/tclPipe.c
@@ -283,7 +283,7 @@ TclCleanupChildren(interp, numPids, pidPtr, errorChan)
     for (i = 0; i < numPids; i++) {
 	/*
 	 * We need to get the resolved pid before we wait on it as
-	 * the windows implimentation of Tcl_WaitPid deletes the
+	 * the windows implementation of Tcl_WaitPid deletes the
 	 * information such that any following calls to TclpGetPid
 	 * fail.
 	 */
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 71c6ab4..7d24d69 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -133,10 +133,10 @@ TclWinNoBackslash(char *path)
     return path;
 }
 
-static unsigned long
+static int
 TclpGetPid(Tcl_Pid pid)
 {
-    return (unsigned long) (size_t) pid;
+    return (int) (size_t) pid;
 }
 
 static void