1 files changed, 9 insertions, 5 deletions
diff --git a/erts/emulator/beam/erl_message.h b/erts/emulator/beam/erl_message.h
index 890af2675c..5aca0db6fe 100644
--- a/erts/emulator/beam/erl_message.h
+++ b/erts/emulator/beam/erl_message.h
@@ -30,16 +30,20 @@ struct external_thing_;
 
 struct erl_off_heap_header {
     Eterm thing_word;
-    union {
-	Uint size;
-	void* ptr;
-    }u;
+    Uint size;
+#if HALFWORD_HEAP
+    void* dummy_ptr_padding__;
+#endif
     struct erl_off_heap_header* next;
 };
 
+#define OH_OVERHEAD(oh, size) do { \
+    (oh)->overhead += size;        \
+} while(0)
+
 typedef struct erl_off_heap {
     struct erl_off_heap_header* first;
-    int overhead;     /* Administrative overhead (used to force GC). */
+    Uint64 overhead;     /* Administrative overhead (used to force GC). */
 } ErlOffHeap;
 
 #include "external.h"