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/nifs | |
| 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/nifs')
| -rw-r--r-- | erts/emulator/nifs/common/zlib_nif.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/erts/emulator/nifs/common/zlib_nif.c b/erts/emulator/nifs/common/zlib_nif.c index b7f3adaffe..a1a65e1946 100644 --- a/erts/emulator/nifs/common/zlib_nif.c +++ b/erts/emulator/nifs/common/zlib_nif.c @@ -33,14 +33,6 @@ #define INFL_DICT_SZ (32768) -#ifndef MAX -#define MAX(X, Y) ((X) > (Y) ? (X) : (Y)) -#endif - -#ifndef MIN -#define MIN(X, Y) ((X) < (Y) ? (X) : (Y)) -#endif - /* NIF interface declarations */ static int load(ErlNifEnv *env, void** priv_data, ERL_NIF_TERM load_info); static int upgrade(ErlNifEnv *env, void** priv_data, void** old_priv_data, ERL_NIF_TERM load_info); |