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/sys.h | |
| 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/sys.h')
| -rw-r--r-- | erts/emulator/beam/sys.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/erts/emulator/beam/sys.h b/erts/emulator/beam/sys.h index 6662685f54..704d567337 100644 --- a/erts/emulator/beam/sys.h +++ b/erts/emulator/beam/sys.h @@ -1268,6 +1268,14 @@ void erl_bin_write(unsigned char *, int, int); # define DEBUGF(x) #endif +#ifndef MAX +#define MAX(A, B) ((A) > (B) ? (A) : (B)) +#endif + +#ifndef MIN +#define MIN(A, B) ((A) < (B) ? (A) : (B)) +#endif + #ifdef __WIN32__ #ifdef ARCH_64 #define ERTS_ALLOC_ALIGN_BYTES 16 |