1 files changed, 7 insertions, 8 deletions
diff --git a/erts/emulator/beam/erl_thr_queue.h b/erts/emulator/beam/erl_thr_queue.h
index edcf2c3823..13af758b3f 100644
--- a/erts/emulator/beam/erl_thr_queue.h
+++ b/erts/emulator/beam/erl_thr_queue.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2011. All Rights Reserved.
+ * Copyright Ericsson AB 2011-2013. All Rights Reserved.
  *
  * The contents of this file are subject to the Erlang Public License,
  * Version 1.1, (the "License"); you may not use this file except in
@@ -76,13 +76,12 @@ typedef struct {
 typedef struct ErtsThrQElement_t_ ErtsThrQElement_t;
 typedef struct ErtsThrQElement_t ErtsThrQPrepEnQ_t;
 
-typedef union {
-    erts_atomic_t atmc;
-    ErtsThrQElement_t *ptr;
-} ErtsThrQPtr_t;
-
 struct ErtsThrQElement_t_ {
-    ErtsThrQPtr_t next;
+#ifdef USE_THREADS
+    erts_atomic_t next;
+#else
+    ErtsThrQElement_t *next;
+#endif
     union {
 	erts_atomic_t atmc;
 	void *ptr;
@@ -130,7 +129,7 @@ struct ErtsThrQ_t_ {
      * thread dequeuing.
      */
     struct {
-	ErtsThrQPtr_t head;
+	erts_atomic_t head;
 	ErtsThrQLive_t live;
 	ErtsThrQElement_t *first;
 	ErtsThrQElement_t *unref_end;