From a3a4e02afa38968088c4f32a658ddb26391bc117 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Thu, 24 Nov 2016 13:18:10 +0000 Subject: Fix compile error if SO_REUSEPORT not supported. Put command options in alphabetical order --- generic/tclIOCmd.c | 6 +++--- 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 } /* -- cgit v0.12