1 files changed, 32 insertions, 100 deletions
diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index 9944ab6..67f3db6 100644
--- a/generic/tclInt.decls
+++ b/generic/tclInt.decls
@@ -410,9 +410,6 @@ declare 103 {
 declare 104 {
     int TclSockMinimumBuffersOld(int sock, int size)
 }
-declare 110 {
-    int TclSockMinimumBuffers(void *sock, int size)
-}
 # Replaced by Tcl_FSStat in 8.4:
 #declare 105 {
 #    int TclStat(const char *path, Tcl_StatBuf *buf)
@@ -429,6 +426,9 @@ declare 108 {
 declare 109 {
     int TclUpdateReturnInfo(Interp *iPtr)
 }
+declare 110 {
+    int TclSockMinimumBuffers(void *sock, int size)
+}
 # Removed in 8.1:
 #  declare 110 {
 #      char *TclWordEnd(char *start, char *lastChar, int nested, int *semiPtr)
@@ -844,12 +844,16 @@ declare 3 win {
 declare 4 win {
     HINSTANCE TclWinGetTclInstance(void)
 }
+# new for 8.4.20+/8.5.12+ Cygwin only
+declare 5 win {
+    int TclUnixWaitForFile(int fd, int mask, int timeout)
+}
 # Removed in 8.1:
 #  declare 5 win {
 #      HINSTANCE TclWinLoadLibrary(char *name)
 #  }
 declare 6 win {
-    u_short TclWinNToHS(u_short ns)
+    unsigned short TclWinNToHS(unsigned short ns)
 }
 declare 7 win {
     int TclWinSetSockOpt(SOCKET s, int level, int optname,
@@ -861,6 +865,10 @@ declare 8 win {
 declare 9 win {
     int TclWinGetPlatformId(void)
 }
+# new for 8.4.20+/8.5.12+ Cygwin only
+declare 10 win {
+    Tcl_DirEntry *TclpReaddir(DIR *dir)
+}
 # Removed in 8.3.1 (for Win32s only)
 #declare 10 win {
 #    int TclWinSynchSpawn(void *args, int type, void **trans, Tcl_Pid *pidPtr)
@@ -882,9 +890,9 @@ declare 14 win {
     int TclpCreatePipe(TclFile *readPipe, TclFile *writePipe)
 }
 declare 15 win {
-    int TclpCreateProcess(Tcl_Interp *interp, int argc, const char **argv,
-	    TclFile inputFile, TclFile outputFile, TclFile errorFile,
-	    Tcl_Pid *pidPtr)
+    int TclpCreateProcess(Tcl_Interp *interp, int argc,
+	    const char **argv, TclFile inputFile, TclFile outputFile,
+	    TclFile errorFile, Tcl_Pid *pidPtr)
 }
 # Signature changed in 8.1:
 #  declare 16 win {
@@ -902,7 +910,10 @@ declare 19 win {
 declare 20 win {
     void TclWinAddProcess(HANDLE hProcess, DWORD id)
 }
-
+# new for 8.4.20+/8.5.12+
+declare 21 win {
+    char *TclpInetNtoa(struct in_addr addr)
+}
 # removed permanently for 8.4
 #declare 21 win {
 #    void TclpAsyncMark(Tcl_AsyncHandler async)
@@ -945,51 +956,42 @@ declare 29 win {
 
 # Pipe channel functions
 
-# On non-cygwin, this is actually a reference to TclGetAndDetachPids
 declare 0 unix {
-    void TclWinConvertError(unsigned int errCode)
+    void TclGetAndDetachPids(Tcl_Interp *interp, Tcl_Channel chan)
 }
-# On non-cygwin, this is actually a reference to TclpCloseFile
 declare 1 unix {
-    void TclWinConvertWSAError(unsigned int errCode)
+    int TclpCloseFile(TclFile file)
 }
-# On non-cygwin, this is actually a reference to TclpCreateCommandChannel
 declare 2 unix {
-    struct servent *TclWinGetServByName(const char *nm, const char *proto)
+    Tcl_Channel TclpCreateCommandChannel(TclFile readFile,
+	    TclFile writeFile, TclFile errorFile, int numPids, Tcl_Pid *pidPtr)
 }
-# On non-cygwin, this is actually a reference to TclpCreatePipe
 declare 3 unix {
-    int TclWinGetSockOpt(void *s, int level, int optname,
-	    char *optval, int *optlen)
+    int TclpCreatePipe(TclFile *readPipe, TclFile *writePipe)
 }
-# On non-cygwin, this is actually a reference to TclpCreateProcess
 declare 4 unix {
-    void *TclWinGetTclInstance(void)
+    int TclpCreateProcess(Tcl_Interp *interp, int argc,
+	    const char **argv, TclFile inputFile, TclFile outputFile,
+	    TclFile errorFile, Tcl_Pid *pidPtr)
 }
 # Signature changed in 8.1:
 #  declare 5 unix {
 #      TclFile TclpCreateTempFile(char *contents, Tcl_DString *namePtr)
 #  }
-
-# On non-cygwin, this is actually a reference to TclpMakeFile
 declare 6 unix {
-    unsigned short TclWinNToHS(unsigned short ns)
+    TclFile TclpMakeFile(Tcl_Channel channel, int direction)
 }
-# On non-cygwin, this is actually a reference to TclpOpenFile
 declare 7 unix {
-    int TclWinSetSockOpt(void *s, int level, int optname,
-	    const char *optval, int optlen)
+    TclFile TclpOpenFile(const char *fname, int mode)
 }
-# On non-cygwin, this is actually a reference to TclUnixWaitForFile
 declare 8 unix {
-    int TclpGetPid(Tcl_Pid pid)
+    int TclUnixWaitForFile(int fd, int mask, int timeout)
 }
 
 # Added in 8.1:
 
-# On non-cygwin, this is actually a reference to TclpCreateTempFile
 declare 9 unix {
-    int TclWinGetPlatformId(void)
+    TclFile TclpCreateTempFile(const char *contents)
 }
 
 # Added in 8.4:
@@ -999,88 +1001,18 @@ declare 10 unix {
 }
 # Slots 11 and 12 are forwarders for functions that were promoted to
 # generic Stubs
-# On cygwin, this is actually a reference to TclGetAndDetachPids
 declare 11 unix {
     struct tm *TclpLocaltime_unix(TclpTime_t_CONST clock)
 }
-# On cygwin, this is actually a reference to TclpCloseFile
 declare 12 unix {
     struct tm *TclpGmtime_unix(TclpTime_t_CONST clock)
 }
-# On cygwin, this is a reference to TclpCreateCommandChannel
-# Otherwise, this is a reference to TclpInetNtoa
 declare 13 unix {
-    void TclIntPlatReserved13(void)
-}
-#On cygwin, TclpCreateProcess is here
-declare 15 unix {
-    int TclMacOSXGetFileAttribute(Tcl_Interp *interp, int objIndex,
-	    Tcl_Obj *fileName, Tcl_Obj **attributePtrPtr)
-}
-#On cygwin, TclpMakeFile is here
-declare 18 unix {
-    int TclMacOSXMatchType(Tcl_Interp *interp, const char *pathName,
-	    const char *fileName, Tcl_StatBuf *statBufPtr,
-	    Tcl_GlobTypeData *types)
-}
-#On cygwin, TclpOpenFile is here
-declare 19 unix {
-    void TclMacOSXNotifierAddRunLoopMode(const void *runLoopMode)
-}
-declare 20 unix {
-    void TclWinAddProcess(void *hProcess, unsigned int id)
-}
-declare 22 unix {
-    TclFile TclpCreateTempFile(const char *contents)
-}
-declare 24 unix {
-    char *TclWinNoBackslash(char *path)
-}
-declare 25 unix {
-    TclPlatformType *TclWinGetPlatform(void)
-}
-declare 26 unix {
-    void TclWinSetInterfaces(int wide)
-}
-declare 27 unix {
-    void TclWinFlushDirtyChannels(void)
-}
-declare 28 unix {
-    void TclWinResetInterfaces(void)
+    char *TclpInetNtoa(struct in_addr addr)
 }
 declare 29 unix {
     int TclWinCPUID(unsigned int index, unsigned int *regs)
 }
-declare 30 unix {
-    void TclGetAndDetachPids(Tcl_Interp *interp, Tcl_Channel chan)
-}
-declare 31 unix {
-    int TclpCloseFile(TclFile file)
-}
-declare 32 unix {
-    Tcl_Channel TclpCreateCommandChannel(TclFile readFile,
-	    TclFile writeFile, TclFile errorFile, int numPids, Tcl_Pid *pidPtr)
-}
-declare 33 unix {
-    int TclpCreatePipe(TclFile *readPipe, TclFile *writePipe)
-}
-declare 34 unix {
-    int TclpCreateProcess(Tcl_Interp *interp,
-	    int argc, const char **argv, TclFile inputFile,
-	    TclFile outputFile, TclFile errorFile, Tcl_Pid *pidPtr)
-}
-declare 35 unix {
-    char *TclpInetNtoa(struct in_addr addr)
-}
-declare 36 unix {
-    TclFile TclpMakeFile(Tcl_Channel channel, int direction)
-}
-declare 37 unix {
-    TclFile TclpOpenFile(const char *fname, int mode)
-}
-declare 38 unix {
-    int TclUnixWaitForFile(int fd, int mask, int timeout)
-}
 
 # Local Variables:
 # mode: tcl