diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-11-24 16:21:20 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-11-24 16:21:20 (GMT) |
| commit | 2cbc2f1993e02356517393361a6af2a81a66e55e (patch) | |
| tree | 83b675a3cbdff2d35445a4304bea8537c44e2834 | |
| parent | 15b2687d3cc301f3e63f0f9953948cf2a258b883 (diff) | |
| parent | 842d6d00f1e11ebdf17ec934d7c7d49381a456c0 (diff) | |
| download | tcl-2cbc2f1993e02356517393361a6af2a81a66e55e.zip tcl-2cbc2f1993e02356517393361a6af2a81a66e55e.tar.gz tcl-2cbc2f1993e02356517393361a6af2a81a66e55e.tar.bz2 | |
merge fork
| -rw-r--r-- | generic/tclIOCmd.c | 6 | ||||
| -rw-r--r-- | unix/tclUnixSock.c | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c index b4696fd..930f5a3 100644 --- a/generic/tclIOCmd.c +++ b/generic/tclIOCmd.c @@ -1485,12 +1485,12 @@ Tcl_SocketObjCmd( Tcl_Obj *const objv[]) /* Argument objects. */ { static const char *const socketOptions[] = { - "-async", "-myaddr", "-myport", "-server", "-reuseaddr", "-reuseport", + "-async", "-myaddr", "-myport", "-reuseaddr", "-reuseport", "-server", NULL }; enum socketOptions { - SKT_ASYNC, SKT_MYADDR, SKT_MYPORT, SKT_SERVER, SKT_REUSEADDR, - SKT_REUSEPORT + SKT_ASYNC, SKT_MYADDR, SKT_MYPORT, SKT_REUSEADDR, SKT_REUSEPORT, + SKT_SERVER }; int optionIndex, a, server = 0, port, myport = 0, async = 0; unsigned int flags = 0; diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c index bb75ed3..187c157 100644 --- a/unix/tclUnixSock.c +++ b/unix/tclUnixSock.c @@ -1523,10 +1523,11 @@ Tcl_OpenTcpServerEx( */ errorMsg = "SO_REUSEPORT isn't supported by this platform"; goto error; -#endif +#else optvalue = 1; (void) setsockopt(sock, SOL_SOCKET, SO_REUSEPORT, (char *) &optvalue, sizeof(optvalue)); +#endif } /* |