summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-03-29 12:13:42 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-03-29 12:13:42 (GMT)
commit4b80a508c87df4ea40e979f3c5fcef1de2c4afcf (patch)
treef2303d5b71bad413b0e5107a6f50f4ca6af040c2 /generic
parent9dc4d62155a906e3cb7a4d11c2332774d2071d83 (diff)
downloadtcl-4b80a508c87df4ea40e979f3c5fcef1de2c4afcf.zip
tcl-4b80a508c87df4ea40e979f3c5fcef1de2c4afcf.tar.gz
tcl-4b80a508c87df4ea40e979f3c5fcef1de2c4afcf.tar.bz2
better solution for bug-510001bug_510001
it fills a correctly working stub entry for Win64
Diffstat (limited to 'generic')
-rw-r--r--generic/tclIOSock.c9
-rw-r--r--generic/tclIntDecls.h13
-rw-r--r--generic/tclStubInit.c7
3 files changed, 29 insertions, 0 deletions
diff --git a/generic/tclIOSock.c b/generic/tclIOSock.c
index f311912..3ed2122 100644
--- a/generic/tclIOSock.c
+++ b/generic/tclIOSock.c
@@ -83,9 +83,18 @@ TclSockGetPort(interp, string, proto, portPtr)
*----------------------------------------------------------------------
*/
+#ifdef _WIN64
+ /* See bug 510001: TclSockMinimumBuffers needs plat imp */
+# define TclSockMinimumBuffers TclSockMinimumBuffersWin64
+#endif
+
int
TclSockMinimumBuffers(sock, size)
+#ifdef _WIN64
+ SOCKET sock; /* Socket file descriptor */
+#else
int sock; /* Socket file descriptor */
+#endif
int size; /* Minimum buffer size */
{
int current;
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index 1d831ed..d53acb5 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -1409,4 +1409,17 @@ extern TclIntStubs *tclIntStubsPtr;
/* !END!: Do not edit above this line. */
+#ifdef _WIN64
+ /* See bug 510001: TclSockMinimumBuffers needs plat imp */
+ extern int TclSockMinimumBuffersWin64(unsigned __int64,int);
+
+# ifdef USE_TCL_STUBS
+# undef TclSockMinimumBuffers
+# define TclSockMinimumBuffers ((int (*)(SOCKET,int)) \
+ tclIntStubsPtr->tclSockMinimumBuffers)
+# else
+# define TclSockMinimumBuffers TclSockMinimumBuffersWin64
+# endif
+#endif
+
#endif /* _TCLINTDECLS */
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 347bdcb..09994b9 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -55,6 +55,13 @@ Tcl_NotifierProcs tclOriginalNotifier = {
NULL
};
+#ifdef _WIN64
+/* See bug 510001: TclSockMinimumBuffers needs plat imp */
+# undef TclSockMinimumBuffers
+# define TclSockMinimumBuffers ((int (*)(int, int)) \
+ TclSockMinimumBuffersWin64)
+#endif
+
#ifdef __CYGWIN__
#define TclWinGetPlatformId winGetPlatformId