From 1e67f9542a8d1be6c1d31048db19b7abe6f47372 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20H=C3=B6gberg?= <john@erlang.org>
Date: Thu, 7 Sep 2017 08:18:11 +0200
Subject: Replace ad-hoc MIN/MAX macros with common ones

Besides being noisy, they were already defined by a global Unix-
specific header, causing the Windows build to fail if one forgot to
define them.
---
 erts/emulator/beam/sys.h | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'erts/emulator/beam/sys.h')

diff --git a/erts/emulator/beam/sys.h b/erts/emulator/beam/sys.h
index 6662685f54..704d567337 100644
--- a/erts/emulator/beam/sys.h
+++ b/erts/emulator/beam/sys.h
@@ -1268,6 +1268,14 @@ void erl_bin_write(unsigned char *, int, int);
 #  define DEBUGF(x)
 #endif
 
+#ifndef MAX
+#define MAX(A, B) ((A) > (B) ? (A) : (B))
+#endif
+
+#ifndef MIN
+#define MIN(A, B) ((A) < (B) ? (A) : (B))
+#endif
+
 #ifdef __WIN32__
 #ifdef ARCH_64
 #define ERTS_ALLOC_ALIGN_BYTES 16
-- 
cgit v1.2.3