aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/sys.h
diff options
context:
space:
mode:
authorSverker Eriksson <sverker@erlang.org>2010-12-22 15:14:39 +0100
committerSverker Eriksson <sverker@erlang.org>2011-02-03 17:33:44 +0100
commit0b09ffabadd38bd2d0fa9cfa735542defc380efc (patch)
treed061b64f2ca8806f961754d78b518c9735e48437 /erts/emulator/beam/sys.h
parent359517b5177756d871b91757160e6840e0fbfe4a (diff)
downloadotp-0b09ffabadd38bd2d0fa9cfa735542defc380efc.tar.gz
otp-0b09ffabadd38bd2d0fa9cfa735542defc380efc.tar.bz2
otp-0b09ffabadd38bd2d0fa9cfa735542defc380efc.zip
HALFWORD ETS 32-bit arch fixes and other cleanups
Diffstat (limited to 'erts/emulator/beam/sys.h')
-rw-r--r--erts/emulator/beam/sys.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/erts/emulator/beam/sys.h b/erts/emulator/beam/sys.h
index e36f7cf8cf..d480229999 100644
--- a/erts/emulator/beam/sys.h
+++ b/erts/emulator/beam/sys.h
@@ -225,16 +225,14 @@ int real_printf(const char *fmt, ...);
#else
#error Neither 32 nor 64 bit architecture
#endif
-#ifdef ARCH_64
-# ifdef HALFWORD_HEAP_EMULATOR
+#if defined(ARCH_64) && defined(HALFWORD_HEAP_EMULATOR)
# define HALFWORD_HEAP 1
# define HALFWORD_ASSERT 0
# define ASSERT_HALFWORD(COND) ASSERT(COND)
-# else
+#else
# define HALFWORD_HEAP 0
# define HALFWORD_ASSERT 0
# define ASSERT_HALFWORD(COND)
-# endif
#endif
#if SIZEOF_VOID_P != SIZEOF_SIZE_T