summaryrefslogtreecommitdiff
path: root/bin/pax/pax.h
diff options
context:
space:
mode:
Diffstat (limited to 'bin/pax/pax.h')
-rw-r--r--bin/pax/pax.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/bin/pax/pax.h b/bin/pax/pax.h
index 13b53283596..1c85aaec837 100644
--- a/bin/pax/pax.h
+++ b/bin/pax/pax.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pax.h,v 1.19 2014/11/23 05:32:20 guenther Exp $ */
+/* $OpenBSD: pax.h,v 1.20 2015/01/16 06:39:32 deraadt Exp $ */
/* $NetBSD: pax.h,v 1.3 1995/03/21 09:07:41 cgd Exp $ */
/*-
@@ -224,9 +224,7 @@ typedef struct oplist {
/*
* General Macros
*/
-#ifndef MIN
-#define MIN(a,b) (((a)<(b))?(a):(b))
-#endif
+#define MINIMUM(a, b) (((a) < (b)) ? (a) : (b))
#define MAJOR(x) major(x)
#define MINOR(x) minor(x)
#define TODEV(x, y) makedev((x), (y))