Re: [chrony-dev] [GIT] chrony/chrony.git branch master updated. 4.3-32-gbadaa83

[David Bohman <debohman@xxxxxxxxx>]

Yes, I used that patch and built the TOT without any problems. It is
now running on this system.

Are we going to take that patch?

On Wed, Jan 18, 2023 at 9:24 AM Bryan Christianson <bryan@xxxxxxxxxxxxx> wrote:
>
> 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.
>

-- 
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.