diff options
| author | Sverker Eriksson <[email protected]> | 2016-11-22 14:22:19 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-11-22 14:22:19 +0100 |
| commit | 9563cd5b296fe589c8abe357710fbb79bc766d09 (patch) | |
| tree | 464ff57782299c2e42d937ab3428a651615bfdbf /erts/emulator/sys | |
| parent | 3d7b55f946162b5a129241dbe67397784a1ba1a5 (diff) | |
| parent | 011242f927259aa477ebe488a3ee3c4e22081488 (diff) | |
| download | otp-9563cd5b296fe589c8abe357710fbb79bc766d09.tar.gz otp-9563cd5b296fe589c8abe357710fbb79bc766d09.tar.bz2 otp-9563cd5b296fe589c8abe357710fbb79bc766d09.zip | |
Merge branch 'sverker/Wundef'
Diffstat (limited to 'erts/emulator/sys')
| -rw-r--r-- | erts/emulator/sys/common/erl_mmap.c | 6 | ||||
| -rw-r--r-- | erts/emulator/sys/unix/erl_unix_sys.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/erts/emulator/sys/common/erl_mmap.c b/erts/emulator/sys/common/erl_mmap.c index 3ab03971a5..169740f8cf 100644 --- a/erts/emulator/sys/common/erl_mmap.c +++ b/erts/emulator/sys/common/erl_mmap.c @@ -1878,7 +1878,7 @@ erts_mremap(ErtsMemMapper* mm, return NULL; } -#if ERTS_HAVE_OS_MREMAP || ERTS_HAVE_GENUINE_OS_MMAP +#if defined(ERTS_HAVE_OS_MREMAP) || defined(ERTS_HAVE_GENUINE_OS_MMAP) superaligned = (ERTS_MMAPFLG_SUPERALIGNED & flags); if (superaligned) { @@ -1898,7 +1898,7 @@ erts_mremap(ErtsMemMapper* mm, } } -#if ERTS_HAVE_GENUINE_OS_MMAP +#ifdef ERTS_HAVE_GENUINE_OS_MMAP if (asize < old_size && (!superaligned || ERTS_IS_SUPERALIGNED(ptr))) { @@ -1913,7 +1913,7 @@ erts_mremap(ErtsMemMapper* mm, return ptr; } #endif -#if ERTS_HAVE_OS_MREMAP +#ifdef ERTS_HAVE_OS_MREMAP if (superaligned) return remap_move(mm, flags, new_ptr, old_size, sizep); else { diff --git a/erts/emulator/sys/unix/erl_unix_sys.h b/erts/emulator/sys/unix/erl_unix_sys.h index b64b0d87f6..bd554238b7 100644 --- a/erts/emulator/sys/unix/erl_unix_sys.h +++ b/erts/emulator/sys/unix/erl_unix_sys.h @@ -46,10 +46,10 @@ #include <signal.h> #include <setjmp.h> -#if HAVE_SYS_SOCKETIO_H +#ifdef HAVE_SYS_SOCKETIO_H # include <sys/socketio.h> #endif -#if HAVE_SYS_SOCKIO_H +#ifdef HAVE_SYS_SOCKIO_H # include <sys/sockio.h> #endif |