diff options
| author | Björn Gustavsson <[email protected]> | 2010-08-20 08:26:21 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2010-08-20 08:26:21 +0200 |
| commit | b709d5626e6b7f3df869ecf7aefa5158cbbac70c (patch) | |
| tree | f6f7ff8b0cb0a081f883e6b7db725ebd3b3e4355 /erts/emulator/beam/utils.c | |
| parent | 5d50784c2700c30c9b4e651f3732e1fc5a7250d4 (diff) | |
| parent | 1abdce9f382edd044142fe2a9b2a2dd02ff85225 (diff) | |
| download | otp-b709d5626e6b7f3df869ecf7aefa5158cbbac70c.tar.gz otp-b709d5626e6b7f3df869ecf7aefa5158cbbac70c.tar.bz2 otp-b709d5626e6b7f3df869ecf7aefa5158cbbac70c.zip | |
Merge branch 'bjorn/remove-elib_malloc/OTP-8764' into dev
* bjorn/remove-elib_malloc/OTP-8764:
erts: Remove broken elib_malloc
erts: Remove the unused mem_drv driver
erts: Remove stray pre-ISO-C compatibility macros
erts: Remove unused decl.h
Diffstat (limited to 'erts/emulator/beam/utils.c')
| -rw-r--r-- | erts/emulator/beam/utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/utils.c b/erts/emulator/beam/utils.c index 25472ef47a..ab5e8b5d4a 100644 --- a/erts/emulator/beam/utils.c +++ b/erts/emulator/beam/utils.c @@ -48,11 +48,11 @@ #undef M_MMAP_THRESHOLD #undef M_MMAP_MAX -#if !defined(ELIB_ALLOC_IS_CLIB) && defined(__GLIBC__) && defined(HAVE_MALLOC_H) +#if defined(__GLIBC__) && defined(HAVE_MALLOC_H) #include <malloc.h> #endif -#if defined(ELIB_ALLOC_IS_CLIB) || !defined(HAVE_MALLOPT) +#if !defined(HAVE_MALLOPT) #undef HAVE_MALLOPT #define HAVE_MALLOPT 0 #endif |