aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_alloc_util.h
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2017-09-07 08:18:11 +0200
committerJohn Högberg <[email protected]>2017-09-07 08:28:10 +0200
commit1e67f9542a8d1be6c1d31048db19b7abe6f47372 (patch)
tree230d85f7f5750494d35d91b7bd51656e1a3bc2c5 /erts/emulator/beam/erl_alloc_util.h
parent5900bd977164eba24311bbf9995a4e313d4013a7 (diff)
downloadotp-1e67f9542a8d1be6c1d31048db19b7abe6f47372.tar.gz
otp-1e67f9542a8d1be6c1d31048db19b7abe6f47372.tar.bz2
otp-1e67f9542a8d1be6c1d31048db19b7abe6f47372.zip
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.
Diffstat (limited to 'erts/emulator/beam/erl_alloc_util.h')
-rw-r--r--erts/emulator/beam/erl_alloc_util.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/erts/emulator/beam/erl_alloc_util.h b/erts/emulator/beam/erl_alloc_util.h
index 73c467aa0a..aa13cda9fb 100644
--- a/erts/emulator/beam/erl_alloc_util.h
+++ b/erts/emulator/beam/erl_alloc_util.h
@@ -238,10 +238,6 @@ void erts_lcnt_update_allocator_locks(int enable);
# endif
#endif
-#undef MIN
-#undef MAX
-#define MIN(X, Y) ((X) < (Y) ? (X) : (Y))
-#define MAX(X, Y) ((X) > (Y) ? (X) : (Y))
#define FLOOR(X, I) (((X)/(I))*(I))
#define CEILING(X, I) ((((X) - 1)/(I) + 1)*(I))