summaryrefslogtreecommitdiffstats
path: root/unix/tclUnixSock.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2022-10-16 17:57:26 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2022-10-16 17:57:26 (GMT)
commita11e803c73d6d21deac044f8ab5601a7a2e5a3bb (patch)
tree3bb5b5a78d3a6fce5982a771d1012c75c7fe5948 /unix/tclUnixSock.c
parentc5a0eca4bc7d0274b95c8ade407fbf3c25bf00e5 (diff)
parent7593fce2300c45d321ff47f31909d0fafe03bf68 (diff)
downloadtcl-a11e803c73d6d21deac044f8ab5601a7a2e5a3bb.zip
tcl-a11e803c73d6d21deac044f8ab5601a7a2e5a3bb.tar.gz
tcl-a11e803c73d6d21deac044f8ab5601a7a2e5a3bb.tar.bz2
Merge 8.7
Diffstat (limited to 'unix/tclUnixSock.c')
-rw-r--r--unix/tclUnixSock.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index 88ffc1f..adcda4f 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -1013,8 +1013,8 @@ TcpGetOptionProc(
if ((len == 0) || ((len > 1) && (optionName[1] == 's') &&
(strncmp(optionName, "-sockname", len) == 0))) {
TcpFdList *fds;
- address sockname;
- socklen_t size;
+ address sockname;
+ socklen_t size;
int found = 0;
WaitForConnect(statePtr, NULL);
@@ -1053,7 +1053,9 @@ TcpGetOptionProc(
if ((len == 0) || ((len > 1) && (optionName[1] == 'k') &&
(strncmp(optionName, "-keepalive", len) == 0))) {
- socklen_t size;
+#if defined(SO_KEEPALIVE)
+ socklen_t size;
+#endif
int opt = 0;
if (len == 0) {
@@ -1071,7 +1073,9 @@ TcpGetOptionProc(
if ((len == 0) || ((len > 1) && (optionName[1] == 'n') &&
(strncmp(optionName, "-nodelay", len) == 0))) {
- socklen_t size;
+#if defined(SOL_TCP) && defined(TCP_NODELAY)
+ socklen_t size;
+#endif
int opt = 0;
if (len == 0) {