summaryrefslogtreecommitdiff
path: root/usr.bin/rsync/extern.h
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2019-02-16 23:16:55 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2019-02-16 23:16:55 +0000
commita7e24a9530666ebdfe12eec9f647b74da888b4ae (patch)
tree3b9685eba5df39d90bebe42a1990401075d7acb8 /usr.bin/rsync/extern.h
parent7332f3c5db994a6392518d86020e4e0be681d94f (diff)
use MINIMUM() instead of MIN() as elsewhere in the tree
Diffstat (limited to 'usr.bin/rsync/extern.h')
-rw-r--r--usr.bin/rsync/extern.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/usr.bin/rsync/extern.h b/usr.bin/rsync/extern.h
index afc6d728316..de907484505 100644
--- a/usr.bin/rsync/extern.h
+++ b/usr.bin/rsync/extern.h
@@ -1,4 +1,4 @@
-/* $Id: extern.h,v 1.16 2019/02/16 17:59:33 deraadt Exp $ */
+/* $Id: extern.h,v 1.17 2019/02/16 23:16:54 deraadt Exp $ */
/*
* Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
*
@@ -199,9 +199,7 @@ struct ident {
struct download;
struct upload;
-#ifndef MIN
-# define MIN(_x1, _x2) ((_x1) < (_x2) ? (_x1) : (_x2))
-#endif
+#define MINIMUM(a, b) (((a) < (b)) ? (a) : (b))
#define LOG0(_sess, _fmt, ...) \
rsync_log((_sess), __FILE__, __LINE__, -1, (_fmt), ##__VA_ARGS__)