merge novemnovem_bug_3598300

1 files changed, 7 insertions, 25 deletions

diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 4057523..311c681 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -90,7 +90,8 @@ TclpIsAtty(int fd)
     return isatty(fd);
 }
 
-int
+#define TclWinGetPlatformId winGetPlatformId
+static int
 TclWinGetPlatformId()
 {
     /* Don't bother to determine the real platform on cygwin,
@@ -106,27 +107,8 @@ void *TclWinGetTclInstance()
     return hInstance;
 }
 
-int
-TclWinSetSockOpt(SOCKET s, int level, int optname,
-	    const char *optval, int optlen)
-{
-    return setsockopt((int) s, level, optname, optval, optlen);
-}
-
-int
-TclWinGetSockOpt(SOCKET s, int level, int optname,
-	    char *optval, int *optlen)
-{
-    return getsockopt((int) s, level, optname, optval, optlen);
-}
-
-struct servent *
-TclWinGetServByName(const char *name, const char *proto)
-{
-    return getservbyname(name, proto);
-}
-
-char *
+#define TclWinNoBackslash winNoBackslash
+static char *
 TclWinNoBackslash(char *path)
 {
     char *p;
@@ -553,12 +535,12 @@ static const TclIntPlatStubs tclIntPlatStubs = {
 #if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
     TclWinConvertError, /* 0 */
     0, /* 1 */
-    TclWinGetServByName, /* 2 */
-    TclWinGetSockOpt, /* 3 */
+    0, /* 2 */
+    0, /* 3 */
     TclWinGetTclInstance, /* 4 */
     TclUnixWaitForFile, /* 5 */
     0, /* 6 */
-    TclWinSetSockOpt, /* 7 */
+    0, /* 7 */
     TclpGetPid, /* 8 */
     TclWinGetPlatformId, /* 9 */
     0, /* 10 */