diff options
| author | Rickard Green <[email protected]> | 2017-01-17 12:34:05 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-01-17 12:34:05 +0100 |
| commit | 894cceaa2191bbb59474c1a1bfc657493c5ea79e (patch) | |
| tree | 4fbd27fbbbd1b1111f10959e893e77229892d82a /erts | |
| parent | 968b6b656abd90a8f9d7bc058bce255a57502fc7 (diff) | |
| parent | 98bdfd73f6fdab9e7284d0063fd594033fc7180e (diff) | |
| download | otp-894cceaa2191bbb59474c1a1bfc657493c5ea79e.tar.gz otp-894cceaa2191bbb59474c1a1bfc657493c5ea79e.tar.bz2 otp-894cceaa2191bbb59474c1a1bfc657493c5ea79e.zip | |
Merge branch 'maint'
* maint:
Do not automatically define HARDDEBUG when DEBUG is defined
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/erl_gc.c | 4 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_gc.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/erts/emulator/beam/erl_gc.c b/erts/emulator/beam/erl_gc.c index a21524c5a4..3e9c6016e4 100644 --- a/erts/emulator/beam/erl_gc.c +++ b/erts/emulator/beam/erl_gc.c @@ -59,6 +59,10 @@ # define ERTS_GC_ASSERT(B) ((void) 1) #endif +#if defined(DEBUG) && 0 +# define HARDDEBUG 1 +#endif + /* * Returns number of elements in an array. */ diff --git a/erts/emulator/beam/erl_gc.h b/erts/emulator/beam/erl_gc.h index 9a177b7c59..2521379664 100644 --- a/erts/emulator/beam/erl_gc.h +++ b/erts/emulator/beam/erl_gc.h @@ -27,10 +27,6 @@ #include "erl_map.h" -#if defined(DEBUG) && !ERTS_GLB_INLINE_INCL_FUNC_DEF -# define HARDDEBUG 1 -#endif - #define IS_MOVED_BOXED(x) (!is_header((x))) #define IS_MOVED_CONS(x) (is_non_value((x))) |