mirror of
https://git.openafs.org/openafs.git
synced 2025-01-18 15:00:12 +00:00
Remove lowercase min/max macro definitions
A prior commit: "Replace lowercase min/max macros with opr_min/max" (Change-Id: Ib7c91b4e59aaf76ab77f293016496d6179c23c88) replaced the uses of the min and max macros with opr_min and opr_max. As a cleanup, remove the definitions for the min() and max() macros. As noted in the above commit, there were several locations that left the min/max macros alone: src/WINNT src/external/heimdal Change-Id: I263d91b04a2aed14bf9e1ebca1616629f36e6b23 Reviewed-on: https://gerrit.openafs.org/15843 Reviewed-by: Cheyenne Wills <cwills@sinenomine.net> Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Andrew Deason <adeason@sinenomine.net> Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
This commit is contained in:
parent
8e1e242ce4
commit
de46edef69
@ -14,7 +14,6 @@
|
||||
#define VSGID S_ISGID
|
||||
#define VSVTX S_ISVTX
|
||||
|
||||
#define min(a, b) (((a) < (b)) ? (a) : (b))
|
||||
#define bcopyin copyin /* Aux has identical bcopyin */
|
||||
|
||||
#define BLKDEV_IOSIZE BSIZE
|
||||
|
@ -808,14 +808,6 @@ extern char traceStr2[];
|
||||
#define dsFree(a) free(a)
|
||||
|
||||
extern void StrUpper(char *s);
|
||||
/* Min() and Max() macros */
|
||||
#ifndef min
|
||||
#define min(a,b) (((a) < (b)) ? (a) : (b))
|
||||
#endif
|
||||
|
||||
#ifndef max
|
||||
#define max(a,b) (((a) > (b)) ? (a) : (b))
|
||||
#endif
|
||||
|
||||
/* Combined file name w/ line number */
|
||||
#define TrFL __FILE__, __LINE__
|
||||
|
@ -176,14 +176,6 @@ typedef struct afs_hyper_t { /* unsigned 64 bit integers */
|
||||
|
||||
#define hadd(a,b) (hadd32(a,(b).low), (a).high += (b).high)
|
||||
|
||||
#if !defined(KERNEL) || defined(UKERNEL)
|
||||
#ifndef AFS_NT40_ENV
|
||||
#define max(a, b) ((a) < (b) ? (b) : (a))
|
||||
#define min(a, b) ((a) > (b) ? (b) : (a))
|
||||
#endif
|
||||
/*#define abs(x) ((x) >= 0 ? (x) : -(x))*/
|
||||
#endif
|
||||
|
||||
/* minumum length of string to pass to int_to_base64 */
|
||||
typedef char b64_string_t[8];
|
||||
#ifndef AFS_NT40_ENV
|
||||
|
@ -66,10 +66,6 @@
|
||||
|
||||
#define ALLOC(X, N) (X) = calloc((N), sizeof(*(X)))
|
||||
|
||||
#ifndef max
|
||||
#define max(a,b) (((a)>(b))?(a):(b))
|
||||
#endif
|
||||
|
||||
#ifndef O_BINARY
|
||||
#define O_BINARY 0
|
||||
#endif
|
||||
|
@ -45,10 +45,6 @@
|
||||
#include "private_data.h"
|
||||
#define XPRT_RXKAD_CLIENT
|
||||
|
||||
#ifndef max
|
||||
#define max(a,b) ((a) < (b)? (b) : (a))
|
||||
#endif /* max */
|
||||
|
||||
static struct rx_securityOps rxkad_client_ops = {
|
||||
rxkad_Close,
|
||||
rxkad_NewConnection, /* every new connection */
|
||||
|
@ -46,11 +46,6 @@
|
||||
|
||||
#include <err.h>
|
||||
|
||||
#undef max
|
||||
#define max(a,b) ((a) > (b) ? (a) : (b))
|
||||
#undef min
|
||||
#define min(a,b) ((a) < (b) ? (a) : (b))
|
||||
|
||||
static int
|
||||
creat_files(int count, long startsize)
|
||||
{
|
||||
|
@ -62,5 +62,4 @@ struct ktime {
|
||||
|
||||
afs_int32 ktime_InterpretDate(struct ktime_date *akdate);
|
||||
|
||||
#define min(a,b) (((a) < (b)) ? (a) : (b))
|
||||
#endif /* __INCL_KTIME_ */
|
||||
|
Loading…
Reference in New Issue
Block a user