diff options
| author | John Högberg <[email protected]> | 2017-09-11 10:08:47 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2017-09-11 10:08:47 +0200 |
| commit | a1601976d5a3eb8027a7f292b0071dd28688c51f (patch) | |
| tree | d76877f1acf1eb931eb91980ea73806cc173abeb /erts/emulator/nifs/common/zlib_nif.c | |
| parent | 6890d375ab3347e337eb1cecf22215e57232b5eb (diff) | |
| parent | 1e67f9542a8d1be6c1d31048db19b7abe6f47372 (diff) | |
| download | otp-a1601976d5a3eb8027a7f292b0071dd28688c51f.tar.gz otp-a1601976d5a3eb8027a7f292b0071dd28688c51f.tar.bz2 otp-a1601976d5a3eb8027a7f292b0071dd28688c51f.zip | |
Merge branch 'john/erts/hoist-min-max-macros' into 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); |