(struct _pthread_descr_struct): Move new elements to the end.

diff --git a/linuxthreads/internals.h b/linuxthreads/internals.h
index 672f0fb8f42d9ab2d738fc40070f8e2413c8736c..671deee060bc87c55c0d8b14a83039d2b66dd588 100644 (file)
--- a/linuxthreads/internals.h
+++ b/linuxthreads/internals.h
@@ -84,7 +84,7 @@ typedef struct _pthread_descr_struct * pthread_descr;
 /* Callback interface for removing the thread from waiting on an
    object if it is cancelled while waiting or about to wait.
    This hold a pointer to the object, and a pointer to a function
-   which ``extricates'' the thread from its enqueued state. 
+   which ``extricates'' the thread from its enqueued state.
    The function takes two arguments: pointer to the wait object,
    and a pointer to the thread. It returns 1 if an extrication
    actually occured, and hence the thread must also be signalled.
@@ -112,7 +112,6 @@ struct _pthread_descr_struct {
   int p_priority;               /* Thread priority (== 0 if not realtime) */
   struct _pthread_fastlock * p_lock; /* Spinlock for synchronized accesses */
   int p_signal;                 /* last signal received */
-  struct pthread_atomic p_resume_count; /* number of times restart() was called on thread */
   sigjmp_buf * p_signal_jmp;    /* where to siglongjmp on a signal or NULL */
   sigjmp_buf * p_cancel_jmp;    /* where to siglongjmp on a cancel or NULL */
   char p_terminated;            /* true if terminated e.g. by pthread_exit */
@@ -125,8 +124,6 @@ struct _pthread_descr_struct {
   char p_cancelstate;           /* cancellation state */
   char p_canceltype;            /* cancellation type (deferred/async) */
   char p_canceled;              /* cancellation request pending */
-  char p_woken_by_cancel;       /* cancellation performed wakeup */
-  pthread_extricate_if *p_extricate; /* See above */
   int * p_errnop;               /* pointer to used errno variable */
   int p_errno;                  /* error returned by last system call */
   int * p_h_errnop;             /* pointer to used h_errno variable */
@@ -141,9 +138,13 @@ struct _pthread_descr_struct {
   size_t p_guardsize;          /* size of guard area */
   pthread_descr p_self;                /* Pointer to this structure */
   int p_nr;                     /* Index of descriptor in __pthread_handles */
-  /* New elements must be added at the end.  */
   int p_report_events;         /* Nonzero if events must be reported.  */
   td_eventbuf_t p_eventbuf;     /* Data for event.  */
+  struct pthread_atomic p_resume_count; /* number of times restart() was
+                                          called on thread */
+  char p_woken_by_cancel;       /* cancellation performed wakeup */
+  pthread_extricate_if *p_extricate; /* See above */
+  /* New elements must be added at the end.  */
 } __attribute__ ((aligned(32))); /* We need to align the structure so that
                                    doubles are aligned properly.  This is 8
                                    bytes on MIPS and 16 bytes on MIPS64.