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/beam/sys.h | |
| 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/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 d54b4b2830..68ef0a23f3 100644 --- a/erts/emulator/beam/sys.h +++ b/erts/emulator/beam/sys.h @@ -1105,6 +1105,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 |