From 8f517fe628a6604af94032a1c61c9cfebbb34afd Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Wed, 15 May 2019 16:52:37 +0000 Subject: [PATCH] xlat: add _OLD suffixes to SO_RCVTIMEO and SO_SNDTIMEO Follow the Linux kernel commit v5.1-rc1~178^2~363^2~1 and rename these constants. * xlat/sock_options.in (SO_RCVTIMEO): Rename to SO_RCVTIMEO_OLD. (SO_SNDTIMEO): Rename to SO_SNDTIMEO_OLD. --- xlat/sock_options.in | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/xlat/sock_options.in b/xlat/sock_options.in index 51b8157a..7504adf2 100644 --- a/xlat/sock_options.in +++ b/xlat/sock_options.in @@ -137,27 +137,27 @@ SO_SNDLOWAT 19 #endif #if defined __powerpc__ -SO_RCVTIMEO 18 +SO_RCVTIMEO_OLD 18 #elif defined __hppa__ || defined __mips__ -SO_RCVTIMEO 4102 +SO_RCVTIMEO_OLD 4102 #elif defined __alpha__ -SO_RCVTIMEO 4114 +SO_RCVTIMEO_OLD 4114 #elif defined __sparc__ -SO_RCVTIMEO 8192 +SO_RCVTIMEO_OLD 8192 #else -SO_RCVTIMEO 20 +SO_RCVTIMEO_OLD 20 #endif #if defined __powerpc__ -SO_SNDTIMEO 19 +SO_SNDTIMEO_OLD 19 #elif defined __hppa__ || defined __mips__ -SO_SNDTIMEO 4101 +SO_SNDTIMEO_OLD 4101 #elif defined __alpha__ -SO_SNDTIMEO 4115 +SO_SNDTIMEO_OLD 4115 #elif defined __sparc__ -SO_SNDTIMEO 16384 +SO_SNDTIMEO_OLD 16384 #else -SO_SNDTIMEO 21 +SO_SNDTIMEO_OLD 21 #endif #if defined __alpha__ -- 2.40.0