diff options
| author | John Högberg <[email protected]> | 2017-09-11 10:09:15 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2017-09-11 10:09:15 +0200 |
| commit | 01455c2e5397702a887cf194c1fa12f2461e6dda (patch) | |
| tree | 53b5743d7d49c4d0fad9b2e41c8dfef0523bb245 /erts/emulator/nifs/common/zlib_nif.c | |
| parent | 8893ad1594b9ea918ede8a791407f9cae8285278 (diff) | |
| parent | a1601976d5a3eb8027a7f292b0071dd28688c51f (diff) | |
| download | otp-01455c2e5397702a887cf194c1fa12f2461e6dda.tar.gz otp-01455c2e5397702a887cf194c1fa12f2461e6dda.tar.bz2 otp-01455c2e5397702a887cf194c1fa12f2461e6dda.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/nifs/common/zlib_nif.c')
| -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); |