about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2013-01-31 00:49:53 -0500
committerRich Felker <dalias@aerifal.cx>2013-01-31 00:49:53 -0500
commit725c55528dff9eefbc88a943749f3bc89bcb433f (patch)
treeccc1dd915e8866b337352661764e64f4c6f9760e
parentd5c164d5ff74f41976f2f983b14ce606fa396221 (diff)
downloadmusl-725c55528dff9eefbc88a943749f3bc89bcb433f.tar.gz
musl-725c55528dff9eefbc88a943749f3bc89bcb433f.tar.xz
musl-725c55528dff9eefbc88a943749f3bc89bcb433f.zip
SOL_TCP is nonstandard and not in the reserved namespace
alternatively, we could define it in sys/socket.h since SO* is
reserved there, and tcp.h includes sys/socket.h in extensions mode.

note that SOL_TCP is simply wrong and it's only here for compatibility
with broken applications. the correct argument to pass for setting TCP
socket options is IPPROTO_TCP, which of course has the same value as
SOL_TCP but works everywhere.
-rw-r--r--include/netinet/tcp.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/netinet/tcp.h b/include/netinet/tcp.h
index 94e54cf3..f0fc1259 100644
--- a/include/netinet/tcp.h
+++ b/include/netinet/tcp.h
@@ -18,9 +18,8 @@
 #define TCP_CONGESTION	 13
 #define TCP_MD5SIG	 14
 
-#define SOL_TCP 6
-
 #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define SOL_TCP 6
 #include <sys/types.h>
 #include <sys/socket.h>
 #endif