aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorHenrik Nord <henrik@erlang.org>2015-10-13 10:52:01 +0200
committerHenrik Nord <henrik@erlang.org>2015-10-13 10:52:01 +0200
commit20f3e74fd1d4bec892771c1feeba43a6fdc75975 (patch)
tree4e6ce61dc283e90d8cc22b36b26f96e3d26d40b0 /erts/emulator
parenta59fa56a169ce927bfc08698f0a3b998b400740b (diff)
parent76197244444991e5dc97089dc0848159d93f4db6 (diff)
downloadotp-20f3e74fd1d4bec892771c1feeba43a6fdc75975.tar.gz
otp-20f3e74fd1d4bec892771c1feeba43a6fdc75975.tar.bz2
otp-20f3e74fd1d4bec892771c1feeba43a6fdc75975.zip
Merge branch 'maint'
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/hipe/hipe_native_bif.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/erts/emulator/hipe/hipe_native_bif.c b/erts/emulator/hipe/hipe_native_bif.c
index 98bda43f0e..688378b2fe 100644
--- a/erts/emulator/hipe/hipe_native_bif.c
+++ b/erts/emulator/hipe/hipe_native_bif.c
@@ -93,9 +93,6 @@ BIF_RETTYPE hipe_set_timeout(BIF_ALIST_1)
{
Process* p = BIF_P;
Eterm timeout_value = BIF_ARG_1;
-#if !defined(ARCH_64)
- Uint time_val;
-#endif
/* XXX: This should be converted to follow BEAM conventions,
* but that requires some compiler changes.
*