| Re: [chrony-dev] [GIT] chrony/chrony.git branch master updated. 4.3-32-gbadaa83 |
[ Thread Index |
Date Index
| More chrony.tuxfamily.org/chrony-dev Archives
]
- To: chrony-dev@xxxxxxxxxxxxxxxxxxxx
- Subject: Re: [chrony-dev] [GIT] chrony/chrony.git branch master updated. 4.3-32-gbadaa83
- From: Bryan Christianson <bryan@xxxxxxxxxxxxx>
- Date: Thu, 19 Jan 2023 06:23:32 +1300
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smtpcorp.com; i=@smtpcorp.com; q=dns/txt; s=a1-4; t=1674062629; h=feedback-id : x-smtpcorp-track : date : message-id : to : subject : from : reply-to : sender : list-unsubscribe; bh=yb/g82qb+Okxg313qsL8VqCay+28Wcr+yqwR6aoBjPQ=; b=X9/HeQCxk14nrg2GdCcpzbpYBvJC+bqqb9O7mjIyrvwrQe3YGxo9UKg0UdEjxC0qO6bgN C6b7YTGkyfyQGRWOOl8rTvE69Pe43Iyx2lCuh7j9LZavQqqelTGnfU2cIdwaj089ypiru4H QnQQioQ8zMqXdGkRFlqn2riPeOFzBiXfmLfGVKduL8O5XBnnPVgzWfDJdU/ZlcoGe6apwHL AhVE/8F6252M8l54t14J5YLw1sYQ44LJ9o8T//y7ZrBaaryy+4OHg91m1+Q103DbFdJFwL/ sClPAt5uEG9KKeye+O6NKBrRIzGf9lwUgMIzyQecMYFOEPt95ht/71OLoDZA==
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=whatroute.net; i=@whatroute.net; q=dns/txt; s=s149811; t=1674062629; h=from : subject : to : message-id : date; bh=yb/g82qb+Okxg313qsL8VqCay+28Wcr+yqwR6aoBjPQ=; b=BzPiqS2iGLQ1vZnueyvVoLl+B6WR1uTJ+rSvOPONRblPvssg2FygMHRutJ9SRQNgrn5EM LC2/R8lE9KaHxz0qdDZ5SytoGjALwZAQJQW+kJcSGddQ4VB+w8X+h4i9mleXUs4oGMR2ot6 GD/PE95Nal+zHSmrL2mfm1TvlV1FoM+T/71wUreKTyy+SCoLdyBSX8Ht5hYY+6uT9S8CUNM owP0mfeT2PqEz2DJ+QIkWCSPZ1XwlXCVR88X1l7iCGYrZanUIU1g++hALzTtq3aWDu2E6LU reFjZXUU8s8BogVzKuEGnvTL71FgAHuUK6n9tBJXJ86dXY6rKwSovIUh26ZA==
- Feedback-id: 149811m:149811acx33YQ:149811sSsV9jAAN6
I fixed it with this patch.
git diff
diff --git a/refclock_sock.c b/refclock_sock.c
index 2302b9d..59eafd6 100644
--- a/refclock_sock.c
+++ b/refclock_sock.c
@@ -61,7 +61,8 @@ struct sock_sample {
/* On 32-bit glibc-based systems enable conversion between timevals using
32-bit and 64-bit time_t to support SOCK clients compiled with different
time_t size than chrony */
-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 34) && __TIMESIZE == 32
+#ifdef __GLIBC_PREREQ
+#if __GLIBC_PREREQ(2, 34) && __TIMESIZE == 32
#define CONVERT_TIMEVAL 1
#if defined(_TIME_BITS) && _TIME_BITS == 64
typedef int32_t alt_time_t;
@@ -75,6 +76,7 @@ struct alt_timeval {
alt_suseconds_t tv_usec;
};
#endif
+#endif
static void read_sample(int sockfd, int event, void *anything)
{
> On 19/01/2023, at 6:14 AM, Bryan Christianson <bryan@xxxxxxxxxxxxx> wrote:
>
> Hi Miroslav
>
> This change does not compile on macOS.
>
> refclock_sock.c:64:32: error: function-like macro '__GLIBC_PREREQ' is not defined
> #if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 34) && __TIMESIZE == 32
> ^
>
> gcc --version
> Apple clang version 14.0.0 (clang-1400.0.29.202)
> Target: x86_64-apple-darwin22.2.0
> Thread model: posix
> InstalledDir: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin
>
> Regards, Bryan
>
>>
>> - Log -----------------------------------------------------------------
>> commit badaa83c319ae5a0bef872d1e7a55bf1260c1b84
>> Author: Miroslav Lichvar <mlichvar@xxxxxxxxxx>
>> Date: Wed Jan 18 16:14:10 2023 +0100
>>
>> refclock: convert mismatched timeval in SOCK messages
>>
>
> Bryan Christianson
> bryan@xxxxxxxxxxxxx
>
>
>
>
> --
> To unsubscribe email chrony-dev-request@xxxxxxxxxxxxxxxxxxxx with "unsubscribe" in the subject.
> For help email chrony-dev-request@xxxxxxxxxxxxxxxxxxxx with "help" in the subject.
> Trouble? Email listmaster@xxxxxxxxxxxxxxxxxxxx.
>
Bryan Christianson
bryan@xxxxxxxxxxxxx
--
To unsubscribe email chrony-dev-request@xxxxxxxxxxxxxxxxxxxx with "unsubscribe" in the subject.
For help email chrony-dev-request@xxxxxxxxxxxxxxxxxxxx with "help" in the subject.
Trouble? Email listmaster@xxxxxxxxxxxxxxxxxxxx.