about summary refs log tree commit diff
path: root/linuxthreads
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-01-05 17:34:44 +0000
committerUlrich Drepper <drepper@redhat.com>2000-01-05 17:34:44 +0000
commitd569d3331fa1497cf177c03f912e5154dac8e204 (patch)
tree44d19fed2dbbbfda1aea63c2c7ee31309bc0fac0 /linuxthreads
parent1914953f71bf9ace1981d838b3777e473e63e8d1 (diff)
downloadglibc-d569d3331fa1497cf177c03f912e5154dac8e204.tar.gz
glibc-d569d3331fa1497cf177c03f912e5154dac8e204.tar.xz
glibc-d569d3331fa1497cf177c03f912e5154dac8e204.zip
Update.
2000-01-05  Andreas Schwab  <schwab@suse.de>

	* iconv/iconv_prog.c (process_block): Add cast to avoid warning.

	* locale/programs/linereader.c: Remove #include of stringtrans.h.
Diffstat (limited to 'linuxthreads')
-rw-r--r--linuxthreads/ChangeLog5
-rw-r--r--linuxthreads/internals.h7
2 files changed, 9 insertions, 3 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 5bfd37d403..b84ceb0cd6 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,8 @@
+2000-01-05  Ulrich Drepper  <drepper@cygnus.com>
+
+	* internals.h (struct _pthread_descr_struct): Move new elements to
+	the end.
+
 2000-01-03  Kaz Kylheku  <kaz@ashi.footprints.net>
 
 	Redesigned how cancellation unblocks a thread from internal
diff --git a/linuxthreads/internals.h b/linuxthreads/internals.h
index 8af2fca335..a9e262b484 100644
--- a/linuxthreads/internals.h
+++ b/linuxthreads/internals.h
@@ -117,7 +117,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 */
@@ -130,8 +129,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 */
@@ -148,6 +145,10 @@ struct _pthread_descr_struct {
   int p_nr;                     /* Index of descriptor in __pthread_handles */
   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 */
   struct __res_state *p_resp;	/* Pointer to resolver state */
   struct __res_state p_res;	/* per-thread resolver state */
   /* New elements must be added at the end.  */