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/beam/erl_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/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 |