From: Dmitry V. Levin <ldv@altlinux.org>
Date: Wed, 17 Jun 2015 19:22:10 +0000 (+0000)
Subject: net: move fallback definitions of SOL_* constants to xlat/
X-Git-Tag: v4.11~500
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fddeeba9b8f83573aff43d4041f1770749cb1235;p=strace

net: move fallback definitions of SOL_* constants to xlat/

* net.c: Move definitions of SOL_* constants ...
* xlat/socketlayers.in: ... here.
---

diff --git a/net.c b/net.c
index ff7b456c..aae04980 100644
--- a/net.c
+++ b/net.c
@@ -80,105 +80,6 @@
 # define SOCK_TYPE_MASK 0xf
 #endif
 
-#ifndef SOL_IP
-# define SOL_IP 0
-#endif
-#ifndef SOL_TCP
-# define SOL_TCP 6
-#endif
-#ifndef SOL_UDP
-# define SOL_UDP 17
-#endif
-#ifndef SOL_IPV6
-# define SOL_IPV6 41
-#endif
-#ifndef SOL_ICMPV6
-# define SOL_ICMPV6 58
-#endif
-#ifndef SOL_SCTP
-# define SOL_SCTP 132
-#endif
-#ifndef SOL_UDPLITE
-# define SOL_UDPLITE 136
-#endif
-#ifndef SOL_RAW
-# define SOL_RAW 255
-#endif
-#ifndef SOL_IPX
-# define SOL_IPX 256
-#endif
-#ifndef SOL_AX25
-# define SOL_AX25 257
-#endif
-#ifndef SOL_ATALK
-# define SOL_ATALK 258
-#endif
-#ifndef SOL_NETROM
-# define SOL_NETROM 259
-#endif
-#ifndef SOL_ROSE
-# define SOL_ROSE 260
-#endif
-#ifndef SOL_DECNET
-# define SOL_DECNET 261
-#endif
-#ifndef SOL_X25
-# define SOL_X25 262
-#endif
-#ifndef SOL_PACKET
-# define SOL_PACKET 263
-#endif
-#ifndef SOL_ATM
-# define SOL_ATM 264
-#endif
-#ifndef SOL_AAL
-# define SOL_AAL 265
-#endif
-#ifndef SOL_IRDA
-# define SOL_IRDA 266
-#endif
-#ifndef SOL_NETBEUI
-# define SOL_NETBEUI 267
-#endif
-#ifndef SOL_LLC
-# define SOL_LLC 268
-#endif
-#ifndef SOL_DCCP
-# define SOL_DCCP 269
-#endif
-#ifndef SOL_NETLINK
-# define SOL_NETLINK 270
-#endif
-#ifndef SOL_TIPC
-# define SOL_TIPC 271
-#endif
-#ifndef SOL_RXRPC
-# define SOL_RXRPC 272
-#endif
-#ifndef SOL_PPPOL2TP
-# define SOL_PPPOL2TP 273
-#endif
-#ifndef SOL_BLUETOOTH
-# define SOL_BLUETOOTH 274
-#endif
-#ifndef SOL_PNPIPE
-# define SOL_PNPIPE 275
-#endif
-#ifndef SOL_RDS
-# define SOL_RDS 276
-#endif
-#ifndef SOL_IUCV
-# define SOL_IUCV 277
-#endif
-#ifndef SOL_CAIF
-# define SOL_CAIF 278
-#endif
-#ifndef SOL_ALG
-# define SOL_ALG 279
-#endif
-#ifndef SOL_NFC
-# define SOL_NFC 280
-#endif
 #include "xlat/socketlayers.h"
 
 #include "xlat/inet_protocols.h"
diff --git a/xlat/socketlayers.in b/xlat/socketlayers.in
index 94bbe52d..85845b74 100644
--- a/xlat/socketlayers.in
+++ b/xlat/socketlayers.in
@@ -1,34 +1,34 @@
-SOL_IP
-SOL_SOCKET
-SOL_TCP
-SOL_UDP
-SOL_IPV6
-SOL_ICMPV6
-SOL_SCTP
-SOL_UDPLITE
-SOL_RAW
-SOL_IPX
-SOL_AX25
-SOL_ATALK
-SOL_NETROM
-SOL_ROSE
-SOL_DECNET
-SOL_X25
-SOL_PACKET
-SOL_ATM
-SOL_AAL
-SOL_IRDA
-SOL_NETBEUI
-SOL_LLC
-SOL_DCCP
-SOL_NETLINK
-SOL_TIPC
-SOL_RXRPC
-SOL_PPPOL2TP
-SOL_BLUETOOTH
-SOL_PNPIPE
-SOL_RDS
-SOL_IUCV
-SOL_CAIF
-SOL_ALG
-SOL_NFC
+SOL_IP		0
+SOL_SOCKET	1
+SOL_TCP		6
+SOL_UDP		17
+SOL_IPV6	41
+SOL_ICMPV6	58
+SOL_SCTP	132
+SOL_UDPLITE	136
+SOL_RAW		255
+SOL_IPX		256
+SOL_AX25	257
+SOL_ATALK	258
+SOL_NETROM	259
+SOL_ROSE	260
+SOL_DECNET	261
+SOL_X25		262
+SOL_PACKET	263
+SOL_ATM		264
+SOL_AAL		265
+SOL_IRDA	266
+SOL_NETBEUI	267
+SOL_LLC		268
+SOL_DCCP	269
+SOL_NETLINK	270
+SOL_TIPC	271
+SOL_RXRPC	272
+SOL_PPPOL2TP	273
+SOL_BLUETOOTH	274
+SOL_PNPIPE	275
+SOL_RDS		276
+SOL_IUCV	277
+SOL_CAIF	278
+SOL_ALG		279
+SOL_NFC		280