From 5af9e85e56dbcae60f771619131ecbc17980fdaa Mon Sep 17 00:00:00 2001
From: rpj <rpj>
Date: Thu, 30 Jun 2011 04:17:09 +0000
Subject: Realign thread struct elements.

---
 ChangeLog   |  1 +
 implement.h | 31 ++++++++++++++++---------------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e27134d..94edb81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
 	the superfluous static cleanup routine and call the release routine
 	directly if popped.
 	* create.c (stackSize): Now type size_t.
+	* pthread.h (struct ptw32_thread_t_): Rearrange to fix element alignments.
 
 2011-06-29 Daniel Richard G. <skunk at iskunk dot org>
 
diff --git a/implement.h b/implement.h
index a221128..5772a78 100644
--- a/implement.h
+++ b/implement.h
@@ -133,38 +133,39 @@ typedef struct ptw32_thread_t_       ptw32_thread_t;
 
 struct ptw32_thread_t_
 {
-#if defined(_UWIN)
-  DWORD dummy[5];
-#endif
   unsigned __int64 seqNumber;	/* Process-unique thread sequence number */
-  DWORD thread;			/* Win32 thread ID */
   HANDLE threadH;		/* Win32 thread handle - POSIX thread is invalid if threadH == 0 */
   pthread_t ptHandle;		/* This thread's permanent pthread_t handle */
   ptw32_thread_t * prevReuse;	/* Links threads on reuse stack */
   volatile PThreadState state;
-  void *exitStatus;
-  void *parms;
-  int ptErrno;
-  int detachState;
   ptw32_mcs_lock_t threadLock;	/* Used for serialised access to public thread state */
-  int sched_priority;		/* As set, not as currently is */
   ptw32_mcs_lock_t stateLock;	/* Used for async-cancel safety */
-  int cancelState;
-  int cancelType;
   HANDLE cancelEvent;
+  void *exitStatus;
+  void *parms;
+  void *keys;
+  void *nextAssoc;
 #if defined(__CLEANUP_C)
-  jmp_buf start_mark;
+  jmp_buf start_mark;		/* Jump buffer follows void* so should be aligned */
 #endif				/* __CLEANUP_C */
 #if defined(HAVE_SIGSET_T)
   sigset_t sigmask;
 #endif				/* HAVE_SIGSET_T */
-  int implicit:1;
-  void *keys;
-  void *nextAssoc;
   ptw32_mcs_lock_t
               robustMxListLock; /* robustMxList lock */
   ptw32_robust_node_t*
                   robustMxList; /* List of currenty held robust mutexes */
+  int ptErrno;
+  int detachState;
+  int sched_priority;		/* As set, not as currently is */
+  int cancelState;
+  int cancelType;
+  int implicit:1;
+  DWORD thread;			/* Win32 thread ID */
+#if defined(_UWIN)
+  DWORD dummy[5];
+#endif
+  size_t align;			/* Force alignment if this struct is packed */
 };
 
 
-- 
cgit v1.2.3