3 files changed, 36 insertions, 10 deletions
diff --git a/erts/emulator/beam/erl_driver.h b/erts/emulator/beam/erl_driver.h
index e80eae0b86..7510f6b724 100644
--- a/erts/emulator/beam/erl_driver.h
+++ b/erts/emulator/beam/erl_driver.h
@@ -371,11 +371,17 @@ typedef struct erl_drv_entry {
 #ifndef ERL_DRIVER_TYPES_ONLY
 
 #if defined(VXWORKS)
-#  define DRIVER_INIT(DRIVER_NAME) ErlDrvEntry* DRIVER_NAME  ## _init(void)
+#  define DRIVER_INIT(DRIVER_NAME) \
+    ErlDrvEntry* DRIVER_NAME  ## _init(void); \
+    ErlDrvEntry* DRIVER_NAME  ## _init(void)
 #elif defined(__WIN32__)
-#  define DRIVER_INIT(DRIVER_NAME) __declspec(dllexport) ErlDrvEntry* driver_init(void)
+#  define DRIVER_INIT(DRIVER_NAME) \
+    __declspec(dllexport) ErlDrvEntry* driver_init(void); \
+    __declspec(dllexport) ErlDrvEntry* driver_init(void)
 #else 
-#  define DRIVER_INIT(DRIVER_NAME) ErlDrvEntry* driver_init(void)
+#  define DRIVER_INIT(DRIVER_NAME) \
+    ErlDrvEntry* driver_init(void); \
+    ErlDrvEntry* driver_init(void)
 #endif
 
 /*
diff --git a/erts/emulator/beam/erl_port_task.c b/erts/emulator/beam/erl_port_task.c
index 2b5e65b11a..a2b08fcf56 100644
--- a/erts/emulator/beam/erl_port_task.c
+++ b/erts/emulator/beam/erl_port_task.c
@@ -731,7 +731,6 @@ erts_port_task_execute(ErtsRunQueue *runq, Port **curr_port_pp)
     int reds = ERTS_PORT_REDS_EXECUTE;
     erts_aint_t io_tasks_executed = 0;
     int fpe_was_unmasked;
-    ErtsPortTaskExeBlockData blk_data = {runq, NULL};
 
     ERTS_SMP_LC_ASSERT(erts_smp_lc_runq_is_locked(runq));
 
@@ -965,8 +964,6 @@ erts_port_task_execute(ErtsRunQueue *runq, Port **curr_port_pp)
 #endif
 
  done:
-    blk_data.resp = &res;
-
     ERTS_SMP_LC_ASSERT(erts_smp_lc_runq_is_locked(runq));
 
     ERTS_PORT_REDUCTIONS_EXECUTED(runq, reds);
diff --git a/erts/emulator/hipe/hipe_bif0.c b/erts/emulator/hipe/hipe_bif0.c
index cec22b3836..28e4382835 100644
--- a/erts/emulator/hipe/hipe_bif0.c
+++ b/erts/emulator/hipe/hipe_bif0.c
@@ -174,8 +174,13 @@ static inline unsigned char *bytearray_lvalue(Eterm bin, Eterm idx)
 {
     Sint i;
     unsigned char *bytes;
+#ifndef DEBUG
+    ERTS_DECLARE_DUMMY(Uint bitoffs);
+    ERTS_DECLARE_DUMMY(Uint bitsize);
+#else
     Uint bitoffs;
     Uint bitsize;
+#endif
 
     if (is_not_binary(bin) ||
 	is_not_small(idx) ||
@@ -235,9 +240,15 @@ BIF_RETTYPE hipe_bifs_bitarray_2(BIF_ALIST_2)
 BIF_RETTYPE hipe_bifs_bitarray_update_3(BIF_ALIST_3)
 {
     unsigned char *bytes, bytemask;
-    Uint bitoffs, bitsize;
     Uint bitnr, bytenr;
     int set;
+#ifndef DEBUG
+    ERTS_DECLARE_DUMMY(Uint bitoffs);
+    ERTS_DECLARE_DUMMY(Uint bitsize);
+#else
+    Uint bitoffs;
+    Uint bitsize;
+#endif
 
     if (is_not_binary(BIF_ARG_1))
 	BIF_ERROR(BIF_P, BADARG);
@@ -267,8 +278,15 @@ BIF_RETTYPE hipe_bifs_bitarray_update_3(BIF_ALIST_3)
 BIF_RETTYPE hipe_bifs_bitarray_sub_2(BIF_ALIST_2)
 {
     unsigned char *bytes, bytemask;
-    Uint bitoffs, bitsize;
     Uint bitnr, bytenr;
+#ifndef DEBUG
+    ERTS_DECLARE_DUMMY(Uint bitoffs);
+    ERTS_DECLARE_DUMMY(Uint bitsize);
+#else
+    Uint bitoffs;
+    Uint bitsize;
+#endif
+
 
     if (is_not_binary(BIF_ARG_1))
 	BIF_ERROR(BIF_P, BADARG);
@@ -397,10 +415,15 @@ BIF_RETTYPE hipe_bifs_enter_code_2(BIF_ALIST_2)
     Uint nrbytes;
     void *bytes;
     void *address;
-    Uint bitoffs;
-    Uint bitsize;
     Eterm trampolines;
     Eterm *hp;
+#ifndef DEBUG
+    ERTS_DECLARE_DUMMY(Uint bitoffs);
+    ERTS_DECLARE_DUMMY(Uint bitsize);
+#else
+    Uint bitoffs;
+    Uint bitsize;
+#endif
 
     if (is_not_binary(BIF_ARG_1))
 	BIF_ERROR(BIF_P, BADARG);