From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 5 Jan 2000 17:51:40 +0000 (+0000)
Subject: (__pthread_initial_thread, pthread_manager_thread): Adjust
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33c01bff2997bb29754bd99c7a50209840ae3e68;p=thirdparty%2Fglibc.git

(__pthread_initial_thread, pthread_manager_thread): Adjust
initializers for struct _pthread_descr_struct change.
---

diff --git a/linuxthreads/pthread.c b/linuxthreads/pthread.c
index 139118dc7a2..bb2e7d98527 100644
--- a/linuxthreads/pthread.c
+++ b/linuxthreads/pthread.c
@@ -40,7 +40,6 @@ struct _pthread_descr_struct __pthread_initial_thread = {
   0,                          /* int p_priority */
   &__pthread_handles[0].h_lock, /* struct _pthread_fastlock * p_lock */
   0,                          /* int p_signal */
-  ATOMIC_INITIALIZER,         /* struct pthread_atomic p_resume_count */
   NULL,                       /* sigjmp_buf * p_signal_buf */
   NULL,                       /* sigjmp_buf * p_cancel_buf */
   0,                          /* char p_terminated */
@@ -53,8 +52,6 @@ struct _pthread_descr_struct __pthread_initial_thread = {
   0,                          /* char p_cancelstate */
   0,                          /* char p_canceltype */
   0,                          /* char p_canceled */
-  0,                          /* char p_woken_by_cancel */
-  NULL,                       /* struct pthread_extricate_if *p_extricate */
   NULL,                       /* int *p_errnop */
   0,                          /* int p_errno */
   NULL,                       /* int *p_h_errnop */
@@ -68,7 +65,12 @@ struct _pthread_descr_struct __pthread_initial_thread = {
   NULL,                       /* void * p_guardaddr */
   0,                          /* size_t p_guardsize */
   &__pthread_initial_thread,  /* pthread_descr p_self */
-  0                           /* Always index 0 */
+  0,                          /* Always index 0 */
+  0,                          /* int p_report_events */
+  {{{0, }}, 0, NULL},         /* td_eventbuf_t p_eventbuf */
+  ATOMIC_INITIALIZER,         /* struct pthread_atomic p_resume_count */
+  0,                          /* char p_woken_by_cancel */
+  NULL                        /* struct pthread_extricate_if *p_extricate */
 };
 
 /* Descriptor of the manager thread; none of this is used but the error
@@ -113,7 +115,12 @@ struct _pthread_descr_struct __pthread_manager_thread = {
   NULL,                       /* void * p_guardaddr */
   0,                          /* size_t p_guardsize */
   &__pthread_manager_thread,  /* pthread_descr p_self */
-  1                           /* Always index 1 */
+  1,                          /* Always index 1 */
+  0,                          /* int p_report_events */
+  {{{0, }}, 0, NULL},         /* td_eventbuf_t p_eventbuf */
+  ATOMIC_INITIALIZER,         /* struct pthread_atomic p_resume_count */
+  0,                          /* char p_woken_by_cancel */
+  NULL                        /* struct pthread_extricate_if *p_extricate */
 };
 
 /* Pointer to the main thread (the father of the thread manager thread) */
@@ -145,7 +152,7 @@ char *__pthread_manager_thread_tos = NULL;
 int __pthread_exit_requested = 0;
 int __pthread_exit_code = 0;
 
-/* Pointers that select new or old suspend/resume functions 
+/* Pointers that select new or old suspend/resume functions
    based on availability of rt signals. */
 
 void (*__pthread_restart)(pthread_descr) = __pthread_restart_old;
@@ -781,7 +788,7 @@ void __pthread_wait_for_restart_signal(pthread_descr self)
    Since the restart signal does not queue, we use an atomic counter to create
    queuing semantics. This is needed to resolve a rare race condition in
    pthread_cond_timedwait_relative. */
-    
+
 void __pthread_restart_old(pthread_descr th)
 {
   if (atomic_increment(&th->p_resume_count) == -1)