OpenAFS Master Repository branch, openafs-stable-1_8_x, updated. openafs-stable-1_8_12_1-3-g4766fac
Gerrit Code Review
gerrit@openafs.org
Thu, 3 Oct 2024 12:38:52 -0400
The following commit has been merged in the openafs-stable-1_8_x branch:
commit 4766fac3bc2b7f02f84db9149b20b6d1a15a220c
Author: Cheyenne Wills <cwills@sinenomine.net>
Date: Tue Aug 13 14:29:10 2024 -0600
Remove MIN and MAX macro definitions
A prior commit:
"opr: replace MIN/MAX macros with opr_min/opr_max"
(Change I2d7b54193ec91f7ead9c5c5f714d9a8bc7533bf7)
replaced all uses of the MIN and MAX macros with opr_min and opr_max.
As a cleanup and to resolve a failure when building the Linux kernel
module with Linux 6.11, remove all the defines for MIN and MAX.
The Linux 6.11 commit:
'minmax: make generic MIN() and MAX() macros available everywhere'
(1a251f52cf)
standardized and consolidated the definitions of the MIN and MAX macros
within the Linux kernel by defining them in an include file that is
widely used already (linux/minmax.h).
With the above Linux commit, the kernel module fails with a redefined
error from the compiler:
"./include/linux/minmax.h:329: error: "MIN" redefined [-Werror]"
Reviewed-on: https://gerrit.openafs.org/15814
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
(cherry picked from commit 8e8ee623d1a21dc8476cde4b6b9d9e292b36691d)
[mmeffie: The MIN/MAX macros are still present in the deprecated afsweb
component.]
Change-Id: I096c386682afbf7de07f7bb882ab9442cbdeb13a
Reviewed-on: https://gerrit.openafs.org/15854
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Mark Vitale <mvitale@sinenomine.net>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Reviewed-by: Cheyenne Wills <cwills@sinenomine.net>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
src/afs/NBSD/osi_machdep.h | 8 --------
src/afs/UKERNEL/afs_usrops.c | 7 -------
src/config/afsconfig-windows.h | 3 ---
src/config/param.generic_fbsd.h | 10 ----------
src/config/param.i386_dfbsd_23.h | 10 ----------
src/config/param.linux26.h | 10 ----------
src/config/param.nbsd15.h | 10 ----------
src/config/param.nbsd16.h | 10 ----------
src/config/param.nbsd20.h | 10 ----------
src/config/param.nbsd21.h | 10 ----------
src/config/param.nbsd30.h | 10 ----------
src/config/param.nbsd40.h | 10 ----------
src/config/param.nbsd50.h | 10 ----------
src/config/param.nbsd60.h | 10 ----------
src/config/param.nbsd70.h | 10 ----------
src/config/param.obsd31.h | 8 --------
src/config/param.obsd32.h | 8 --------
src/config/param.obsd33.h | 8 --------
src/config/param.obsd34.h | 8 --------
src/config/param.obsd35.h | 8 --------
src/config/param.obsd36.h | 8 --------
src/config/param.obsd37.h | 8 --------
src/config/param.obsd38.h | 8 --------
src/config/param.obsd39.h | 8 --------
src/config/param.obsd40.h | 8 --------
src/config/param.obsd41.h | 8 --------
src/config/param.obsd42.h | 8 --------
src/config/param.obsd43.h | 8 --------
src/config/param.obsd44.h | 8 --------
src/config/param.obsd45.h | 8 --------
src/config/param.obsd46.h | 8 --------
src/config/param.obsd47.h | 8 --------
src/config/param.obsd48.h | 8 --------
src/config/param.obsd49.h | 8 --------
src/config/param.obsd50.h | 8 --------
src/config/param.obsd51.h | 8 --------
src/config/param.obsd52.h | 8 --------
src/config/param.obsd53.h | 8 --------
src/config/param.obsd54.h | 8 --------
src/lwp/iomgr.c | 4 ----
src/rx/rx_getaddr.c | 4 ----
src/rx/rx_packet.h | 9 +--------
42 files changed, 1 insertion(+), 346 deletions(-)
--
OpenAFS Master Repository