diff options
author | John Högberg <[email protected]> | 2017-09-07 08:18:11 +0200 |
---|---|---|
committer | John Högberg <[email protected]> | 2017-09-07 08:28:10 +0200 |
commit | 1e67f9542a8d1be6c1d31048db19b7abe6f47372 (patch) | |
tree | 230d85f7f5750494d35d91b7bd51656e1a3bc2c5 /erts/emulator/beam/erl_nif.c | |
parent | 5900bd977164eba24311bbf9995a4e313d4013a7 (diff) | |
download | otp-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_nif.c')
-rw-r--r-- | erts/emulator/beam/erl_nif.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c index a3016ca912..ac4ecd77e5 100644 --- a/erts/emulator/beam/erl_nif.c +++ b/erts/emulator/beam/erl_nif.c @@ -67,14 +67,6 @@ #include <limits.h> #include <stddef.h> /* offsetof */ -#ifndef MAX -#define MAX(X, Y) ((X) > (Y) ? (X) : (Y)) -#endif - -#ifndef MIN -#define MIN(X, Y) ((X) < (Y) ? (X) : (Y)) -#endif - /* Information about a loaded nif library. * Each successful call to erlang:load_nif will allocate an instance of * erl_module_nif. Two calls opening the same library will thus have the same |