mirror of
https://git.openafs.org/openafs.git
synced 2025-01-18 15:00:12 +00:00
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]" Change-Id: Ibcf186d56b3bdeaaf2dc05afe865049182b2ddce 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>
This commit is contained in:
parent
915c5cff16
commit
8e8ee623d1
@ -184,14 +184,6 @@ extern struct lock afs_global_lock;
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) && !defined(IGNORE_STDS_H)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
|
||||
#endif /* ASSEMBLER */
|
||||
|
||||
/* vnodes */
|
||||
|
@ -47,13 +47,6 @@
|
||||
#define CELLINFOFILE "CellItems"
|
||||
#define MAXIPADDRS 64
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A)<(B)?(A):(B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A)>(B)?(A):(B))
|
||||
#endif
|
||||
|
||||
extern int cacheDiskType;
|
||||
|
||||
char afs_LclCellName[64];
|
||||
|
@ -271,6 +271,3 @@ typedef int errno_t;
|
||||
|
||||
/* Build afsroken.dll as a dynamic library */
|
||||
#define ROKEN_LIB_DYNAMIC 1
|
||||
|
||||
#define MAX(a,b) (((a) > (b)) ? (a) : (b))
|
||||
#define MIN(a,b) (((a) < (b)) ? (a) : (b))
|
||||
|
@ -88,16 +88,6 @@
|
||||
|
||||
# if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
# ifdef KERNEL
|
||||
# ifndef MIN
|
||||
# define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
# endif
|
||||
# ifndef MAX
|
||||
# define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
# endif
|
||||
# endif /* KERNEL */
|
||||
|
||||
# endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
|
||||
#endif /* _KERNEL */
|
||||
|
||||
|
@ -99,16 +99,6 @@
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifdef KERNEL
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
#endif /* KERNEL */
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
|
||||
#endif /* _KERNEL */
|
||||
|
||||
|
@ -39,16 +39,6 @@
|
||||
#define AFS_GLOBAL_SUNLOCK
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
#ifdef KERNEL
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
|
||||
#endif /* KERNEL */
|
||||
|
||||
#ifndef KERNEL
|
||||
#define __USE_LARGEFILE64 1
|
||||
#if !defined off64_t
|
||||
|
@ -88,16 +88,6 @@
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifdef KERNEL
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
#endif /* KERNEL */
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
|
||||
#endif /* _KERNEL */
|
||||
|
||||
|
@ -89,16 +89,6 @@
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifdef KERNEL
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
#endif /* KERNEL */
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
|
||||
#endif /* _KERNEL */
|
||||
|
||||
|
@ -95,16 +95,6 @@
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) && !defined(IGNORE_STDS_H)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifdef KERNEL
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
#endif /* KERNEL */
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ && !defined(IGNORE_STDS_H) */
|
||||
#endif /* _KERNEL */
|
||||
|
||||
|
@ -95,16 +95,6 @@
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) && !defined(IGNORE_STDS_H)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifdef KERNEL
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
#endif /* KERNEL */
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ && !defined(IGNORE_STDS_H) */
|
||||
#endif /* _KERNEL */
|
||||
|
||||
|
@ -91,16 +91,6 @@
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) && !defined(IGNORE_STDS_H)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifdef KERNEL
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
#endif /* KERNEL */
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ && !defined(IGNORE_STDS_H) */
|
||||
#endif /* _KERNEL */
|
||||
|
||||
|
@ -97,16 +97,6 @@
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) && !defined(IGNORE_STDS_H)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifdef KERNEL
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
#endif /* KERNEL */
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ && !defined(IGNORE_STDS_H) */
|
||||
#endif /* _KERNEL_DEPRECATED */
|
||||
|
||||
|
@ -94,16 +94,6 @@
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) && !defined(IGNORE_STDS_H)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifdef KERNEL
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
#endif /* KERNEL */
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ && !defined(IGNORE_STDS_H) */
|
||||
#endif /* _KERNEL_DEPRECATED */
|
||||
|
||||
|
@ -95,16 +95,6 @@
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) && !defined(IGNORE_STDS_H)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifdef KERNEL
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
#endif /* KERNEL */
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ && !defined(IGNORE_STDS_H) */
|
||||
#endif /* _KERNEL_DEPRECATED */
|
||||
|
||||
|
@ -96,16 +96,6 @@
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) && !defined(IGNORE_STDS_H)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifdef KERNEL
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
#endif /* KERNEL */
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ && !defined(IGNORE_STDS_H) */
|
||||
#endif /* _KERNEL_DEPRECATED */
|
||||
|
||||
|
@ -44,14 +44,6 @@
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
|
||||
#endif /* _KERNEL */
|
||||
|
||||
|
@ -43,14 +43,6 @@
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
|
||||
#endif /* _KERNEL */
|
||||
|
||||
|
@ -47,14 +47,6 @@
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
|
||||
#endif /* _KERNEL */
|
||||
|
||||
|
@ -47,14 +47,6 @@
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
|
||||
#endif /* _KERNEL */
|
||||
|
||||
|
@ -47,14 +47,6 @@
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
|
||||
#endif /* _KERNEL */
|
||||
|
||||
|
@ -49,14 +49,6 @@
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
|
||||
#endif /* _KERNEL */
|
||||
|
||||
|
@ -50,14 +50,6 @@
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
|
||||
#endif /* _KERNEL */
|
||||
|
||||
|
@ -51,14 +51,6 @@
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
|
||||
#endif /* _KERNEL */
|
||||
|
||||
|
@ -55,14 +55,6 @@
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
|
||||
#endif /* _KERNEL */
|
||||
|
||||
|
@ -51,14 +51,6 @@
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
|
||||
#endif /* _KERNEL */
|
||||
|
||||
|
@ -54,14 +54,6 @@
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
|
||||
#endif /* _KERNEL */
|
||||
|
||||
|
@ -59,14 +59,6 @@
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
|
||||
#endif /* _KERNEL */
|
||||
|
||||
|
@ -60,14 +60,6 @@
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
|
||||
#endif /* _KERNEL */
|
||||
|
||||
|
@ -61,14 +61,6 @@
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
|
||||
#endif /* _KERNEL */
|
||||
|
||||
|
@ -61,14 +61,6 @@
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
|
||||
#endif /* _KERNEL */
|
||||
|
||||
|
@ -66,14 +66,6 @@
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
|
||||
#endif /* _KERNEL */
|
||||
|
||||
|
@ -67,14 +67,6 @@
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
|
||||
#endif /* _KERNEL */
|
||||
|
||||
|
@ -64,14 +64,6 @@
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
|
||||
#endif /* _KERNEL */
|
||||
|
||||
|
@ -65,14 +65,6 @@
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
|
||||
#endif /* _KERNEL */
|
||||
|
||||
|
@ -66,14 +66,6 @@
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
|
||||
#endif /* _KERNEL */
|
||||
|
||||
|
@ -67,14 +67,6 @@
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
|
||||
#endif /* _KERNEL */
|
||||
|
||||
|
@ -68,14 +68,6 @@
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
|
||||
#endif /* _KERNEL */
|
||||
|
||||
|
@ -69,14 +69,6 @@
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
|
||||
#endif /* _KERNEL */
|
||||
|
||||
|
@ -70,14 +70,6 @@
|
||||
|
||||
#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
|
||||
enum vcexcl { NONEXCL, EXCL };
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(A,B) ((A) < (B) ? (A) : (B))
|
||||
#endif
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) ((A) > (B) ? (A) : (B))
|
||||
#endif
|
||||
|
||||
#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
|
||||
#endif /* _KERNEL */
|
||||
|
||||
|
@ -51,10 +51,6 @@ typedef unsigned char bool;
|
||||
#define FALSE 0
|
||||
#define TRUE 1
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(a,b) (((a)>(b)) ? (b) : (a))
|
||||
#endif
|
||||
|
||||
#ifndef NSIG
|
||||
#define NSIG 8*sizeof(sigset_t)
|
||||
#endif
|
||||
|
@ -105,10 +105,6 @@ rxi_getaddr(void)
|
||||
|
||||
#if !defined(KERNEL) || defined(UKERNEL)
|
||||
|
||||
#ifndef MAX
|
||||
#define MAX(A,B) (((A)<(B)) ? (B) : (A))
|
||||
#endif
|
||||
|
||||
#ifdef UKERNEL
|
||||
#undef ioctl
|
||||
#endif /* UKERNEL */
|
||||
|
@ -32,14 +32,7 @@
|
||||
*/
|
||||
|
||||
|
||||
#if defined(AFS_NT40_ENV)
|
||||
# ifndef MIN
|
||||
# define MIN(a,b) ((a)<(b)?(a):(b))
|
||||
# endif
|
||||
# ifndef MAX
|
||||
# define MAX(a,b) ((a)>(b)?(a):(b))
|
||||
# endif
|
||||
#else /* AFS_NT40_ENV */
|
||||
#if !defined(AFS_NT40_ENV)
|
||||
# if !defined(AFS_DARWIN_ENV) && !defined(AFS_USR_DARWIN_ENV) \
|
||||
&& !defined(AFS_XBSD_ENV) && !defined(AFS_USR_FBSD_ENV) \
|
||||
&& !defined(AFS_USR_DFBSD_ENV) && !defined(AFS_LINUX_ENV)
|
||||
|
Loading…
Reference in New Issue
Block a user