OpenAFS Master Repository branch, master, updated. openafs-devel-1_9_1-487-g915c5cf

[Gerrit Code Review]

The following commit has been merged in the master branch:
commit 915c5cff168344797e011ee81913d4026c0cea80
Author: Cheyenne Wills <cwills@sinenomine.net>
Date:   Mon Sep 9 13:15:47 2024 -0600

    opr: replace MIN/MAX macros with opr_min/opr_max
    
    Introduce new macros, opr_min() and opr_max(), to avoid collisions with
    existing MIN()/MAX() macros defined elsewhere.
    
    Within OpenAFS, the MIN/MAX macros are defined in the platform specific
    param.h include file.  This same file is where AFS_{platform}_ENV is
    defined, which is used throughout the OpenAFS source to determine which
    platform specific headers are to be used.  This can lead to collisions
    if platform provided headers define MIN or MAX.
    
    Introduce opr_min and opr_max, using the same definitions that have been
    used for MIN and MAX.  Put the definitions in opr.h, which is already
    included in most of the code that uses the MIN or MAX macros.
    
    Replace all uses of MIN and MAX with opr_min and opr_max.
    
    Add or move the include for afs/opr.h as needed.
    
    Note, this commit does not replace the min()/max() macros.
    
    A later commit will remove the defines for MIN and MAX (which will
    correct a Linux 6.11 build failure due to a collision).
    
    Change-Id: I2d7b54193ec91f7ead9c5c5f714d9a8bc7533bf7
    Reviewed-on: https://gerrit.openafs.org/15813
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
    Reviewed-by: Andrew Deason <adeason@sinenomine.net>

 src/afs/AIX/osi_groups.c          |  3 +-
 src/afs/DARWIN/osi_groups.c       |  3 +-
 src/afs/DARWIN/osi_vnodeops.c     |  3 +-
 src/afs/FBSD/osi_groups.c         |  3 +-
 src/afs/HPUX/osi_groups.c         |  3 +-
 src/afs/HPUX/osi_vnodeops.c       |  9 ++---
 src/afs/IRIX/osi_groups.c         |  3 +-
 src/afs/IRIX/osi_vnodeops.c       | 13 +++----
 src/afs/NBSD/osi_groups.c         |  3 +-
 src/afs/NBSD/osi_vnodeops.c       |  3 +-
 src/afs/OBSD/osi_groups.c         |  3 +-
 src/afs/UKERNEL/afs_usrops.c      |  3 +-
 src/afs/VNOPS/afs_vnop_strategy.c |  3 +-
 src/afs/VNOPS/afs_vnop_write.c    |  3 +-
 src/afs/afs_call.c                |  5 +--
 src/lwp/iomgr.c                   |  2 +-
 src/opr/opr.h                     |  3 ++
 src/rx/AIX/rx_knet.c              |  7 ++--
 src/rx/DARWIN/rx_knet.c           |  7 ++--
 src/rx/FBSD/rx_knet.c             |  7 ++--
 src/rx/IRIX/rx_knet.c             |  8 ++---
 src/rx/SOLARIS/rx_knet.c          | 13 +++----
 src/rx/rx.c                       | 76 +++++++++++++++++++--------------------
 src/rx/rx_getaddr.c               |  8 +++--
 src/rx/rx_globals.h               |  2 +-
 src/rx/rx_kcommon.c               | 37 +++++++++----------
 src/rx/rx_packet.c                | 35 +++++++++---------
 src/rx/rx_packet.h                |  2 +-
 src/rx/rx_rdwr.c                  | 22 ++++++------
 src/rx/rx_user.c                  | 28 +++++++--------
 src/rxkad/crypt_conn.c            |  6 ++--
 src/rxkad/rxkad_client.c          |  3 +-
 32 files changed, 177 insertions(+), 152 deletions(-)

-- 
OpenAFS Master Repository