diff options
author | dgp <dgp@users.sourceforge.net> | 2012-11-26 21:49:46 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2012-11-26 21:49:46 (GMT) |
commit | 0f9dcb1c0107a267f8c01044bf40150cb0fc3de7 (patch) | |
tree | 86b721f01ddf253a2187373a68f201a4a331cd88 /generic/tclStubInit.c | |
parent | ca9896b71ed5c2ff2d8bc5e8070aff57048278bd (diff) | |
parent | 36353f6c04ced7f2f47bd497272b5f291f14e6ad (diff) | |
download | tcl-0f9dcb1c0107a267f8c01044bf40150cb0fc3de7.zip tcl-0f9dcb1c0107a267f8c01044bf40150cb0fc3de7.tar.gz tcl-0f9dcb1c0107a267f8c01044bf40150cb0fc3de7.tar.bz2 |
merge (some of) novem
Diffstat (limited to 'generic/tclStubInit.c')
-rw-r--r-- | generic/tclStubInit.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index 9fcb1d3..582e739 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -42,18 +42,6 @@ #undef TclpGetPid #undef TclSockMinimumBuffers -/* See bug 510001: TclSockMinimumBuffers needs plat imp */ -#ifdef _WIN64 -# define TclSockMinimumBuffersOld 0 -#else -#define TclSockMinimumBuffersOld sockMinimumBuffersOld -static int TclSockMinimumBuffersOld(int sock, int size) -{ - return TclSockMinimumBuffers(INT2PTR(sock), size); -} -#endif - - #if defined(_WIN32) || defined(__CYGWIN__) #undef TclWinNToHS #define TclWinNToHS winNToHS @@ -193,7 +181,7 @@ static const TclIntStubs tclIntStubs = { TclCleanupChildren, /* 5 */ TclCleanupCommand, /* 6 */ TclCopyAndCollapse, /* 7 */ - TclCopyChannelOld, /* 8 */ + 0, /* 8 */ TclCreatePipeline, /* 9 */ TclCreateProc, /* 10 */ TclDeleteCompiledLocalVars, /* 11 */ @@ -289,7 +277,7 @@ static const TclIntStubs tclIntStubs = { TclSetPreInitScript, /* 101 */ TclSetupEnv, /* 102 */ TclSockGetPort, /* 103 */ - TclSockMinimumBuffersOld, /* 104 */ + 0, /* 104 */ 0, /* 105 */ 0, /* 106 */ 0, /* 107 */ @@ -874,7 +862,7 @@ const TclStubs tclStubs = { Tcl_ResetResult, /* 217 */ Tcl_ScanElement, /* 218 */ Tcl_ScanCountedElement, /* 219 */ - Tcl_SeekOld, /* 220 */ + 0, /* 220 */ Tcl_ServiceAll, /* 221 */ Tcl_ServiceEvent, /* 222 */ Tcl_SetAssocData, /* 223 */ @@ -900,7 +888,7 @@ const TclStubs tclStubs = { Tcl_SplitPath, /* 243 */ Tcl_StaticPackage, /* 244 */ Tcl_StringMatch, /* 245 */ - Tcl_TellOld, /* 246 */ + 0, /* 246 */ Tcl_TraceVar, /* 247 */ Tcl_TraceVar2, /* 248 */ Tcl_TranslateFileName, /* 249 */ |