[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20191102000233.GQ16318@brightrain.aerifal.cx>
Date: Fri, 1 Nov 2019 20:02:33 -0400
From: Rich Felker <dalias@...c.org>
To: musl@...ts.openwall.com
Subject: Re: [PATCH v2] remaining steps for time64 switchover
On Fri, Nov 01, 2019 at 04:25:40PM -0400, Rich Felker wrote:
> From: Rich Felker <dalias@...ifal.cx>
> Date: Fri, 2 Aug 2019 15:41:27 -0400
> Subject: [PATCH 14/15] switch all existing 32-bit archs to 64-bit time_t
>
> [...]
>
> diff --git a/include/sys/socket.h b/include/sys/socket.h
> index 4ea7be1e..3db3cca3 100644
> --- a/include/sys/socket.h
> +++ b/include/sys/socket.h
> @@ -225,6 +225,13 @@ struct linger {
> #endif
>
> #ifndef SO_RCVTIMEO
> +#if __LONG_MAX == 0x7fffffff
> +#define SO_TIMESTAMP 63
> +#define SO_TIMESTAMPNS 64
> +#define SO_TIMESTAMPING 65
> +#define SO_RCVTIMEO 66
> +#define SO_SNDTIMEO 67
> +#else
> #define SO_RCVTIMEO 20
> #define SO_SNDTIMEO 21
> #endif
> @@ -234,6 +241,7 @@ struct linger {
> #define SO_TIMESTAMPNS 35
> #define SO_TIMESTAMPING 37
> #endif
> +#endif
>
> #define SO_SECURITY_AUTHENTICATION 22
> #define SO_SECURITY_ENCRYPTION_TRANSPORT 23
> --
> 2.21.0
>
Somehow this got badly botched in rebasing. There's supposed to be
versions of this conditional for both #ifndef's.
I'm in the process of trying to factor this to two commits to avoid
touching non-arch-specific bits in the switchover commit. If that
works out ok I'll post a v3. Probably spending more effort on this
than I should but I'd like a nice audit trail of how the change was
logically made.
Rich
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
