Re: [PATCH BlueZ 1/2] shared/util: Add MIN/MAX implementations

[Bastien Nocera <hadess@hadess.net>]

On Tue, 2026-03-31 at 10:00 -0400, Luiz Augusto von Dentz wrote:
> Hi Bastien,
> 
> On Mon, Mar 30, 2026 at 10:42 AM Bastien Nocera <hadess@hadess.net>
> wrote:
> > 
> > And remove it from src/sdpd-request.c to avoid a redefinition
> > warning
> > at compile-time.
> > ---
> >  src/sdpd-request.c | 2 --
> >  src/shared/util.h  | 6 ++++++
> >  2 files changed, 6 insertions(+), 2 deletions(-)
> > 
> > diff --git a/src/sdpd-request.c b/src/sdpd-request.c
> > index 1fc07e97bfe0..7c632c2aaf62 100644
> > --- a/src/sdpd-request.c
> > +++ b/src/sdpd-request.c
> > @@ -40,8 +40,6 @@ typedef struct {
> > 
> >  #define SDP_CONT_STATE_SIZE (sizeof(uint8_t) +
> > sizeof(sdp_cont_state_t))
> > 
> > -#define MIN(x, y) ((x) < (y)) ? (x): (y)
> > -
> >  typedef struct sdp_cont_info sdp_cont_info_t;
> > 
> >  struct sdp_cont_info {
> > diff --git a/src/shared/util.h b/src/shared/util.h
> > index c480351d6e9f..99a5aa2daf32 100644
> > --- a/src/shared/util.h
> > +++ b/src/shared/util.h
> > @@ -22,6 +22,12 @@
> >  #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
> >  #define BIT(n)  (1 << (n))
> > 
> > +#undef MIN
> > +#define MIN(a, b) ((a) > (b) ? (a) : (b))
> > +
> > +#undef MAX
> > +#define MAX(a, b) ((a) < (b) ? (a) : (b))
> 
> This is causing many tests to fail with `make check`. It looks like
> the conditions are wrong, so MIN works as MAX and vice versa.

Whoops, fixed.

> 
> >  #if __BYTE_ORDER == __LITTLE_ENDIAN
> >  #define le16_to_cpu(val) (val)
> >  #define le32_to_cpu(val) (val)
> > --
> > 2.53.0
> > 
> > 
>