Re: [PATCH v2 07/19] Provide zlib's uncompress2 from compat/zlib-compat.c

From: Carlo Arenas <carenas@gmail.com>
Date: Sep 15, 2021, 07:34 UTC
Message-ID: <CAPUEspiY=V3y10nc-xUpv7AXwtTv1e1jyRC6FvRrcS3H_ASNnw@mail.gmail.com>
In-Reply-To: <e595dbc6c843fdb01c333fd20031d59716804b88.1631213265.git.gitgitgadget@gmail.com>

On Thu, Sep 9, 2021 at 11:47 AM Han-Wen Nienhuys via GitGitGadget <gitgitgadget@gmail.com> wrote:

Show 9 quoted lines

> diff --git a/config.mak.uname b/config.mak.uname
> index 76516aaa9a5..9beacda4434 100644
> --- a/config.mak.uname
> +++ b/config.mak.uname
> @@ -258,6 +258,11 @@ ifeq ($(uname_S),FreeBSD)
>         FILENO_IS_A_MACRO = UnfortunatelyYes
>  endif
>  ifeq ($(uname_S),OpenBSD)
> +       NO_UNCOMPRESS2 = YesPlease

This first line is no longer needed and is counter productive The logic in the next 4 sets this variable correctly, otherwise

Show 7 quoted lines

> +       # Versions < 7.0 need compatibility layer
> +       ifeq ($(shell expr "$(uname_R)" : "[1-6]\."),2)
> +               NO_UNCOMPRESS2 = UnfortunatelyYes
> +       endif
>         NO_STRCASESTR = YesPlease
>         NO_MEMMEM = YesPlease
>         USE_ST_TIMESPEC = YesPlease

Carlo