* sysdeps/pthread/pthread-functions.h (struct pthread_functions): Move

	ptr___pthread_cond_timedwait to the end of the structure to avoid
	breaking Wine unnecessarily.

diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 05dba57b7ca0ad170d4a1e1a4b3ea8bb3130ec6c..56947bb614d9b2e9506abe6cfd039e5aeaf4cb27 100644 (file)
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-10  Jakub Jelinek  <jakub@redhat.com>
+
+       * sysdeps/pthread/pthread-functions.h (struct pthread_functions): Move
+       ptr___pthread_cond_timedwait to the end of the structure to avoid
+       breaking Wine unnecessarily.
+
 2003-09-08  Jakub Jelinek  <jakub@redhat.com>
 
        * sysdeps/unix/sysv/linux/s390/bits/typesizes.h: Remove.

diff --git a/linuxthreads/sysdeps/pthread/pthread-functions.h b/linuxthreads/sysdeps/pthread/pthread-functions.h
index e2d17f78c5a3751af1ac931824620a032b40e306..deade5c981c4bccbe5e3429e93de87fe8ecda1d8 100644 (file)
--- a/linuxthreads/sysdeps/pthread/pthread-functions.h
+++ b/linuxthreads/sysdeps/pthread/pthread-functions.h
@@ -27,7 +27,8 @@
 struct fork_block;
 
 /* Data type shared with libc.  The libc uses it to pass on calls to
-   the thread functions.  */
+   the thread functions.  Wine pokes directly into this structure,
+   so if possible avoid breaking it and append new hooks to the end.  */
 struct pthread_functions
 {
   pid_t (*ptr_pthread_fork) (struct fork_block *);
@@ -54,8 +55,6 @@ struct pthread_functions
                                  const pthread_condattr_t *);
   int (*ptr___pthread_cond_signal) (pthread_cond_t *);
   int (*ptr___pthread_cond_wait) (pthread_cond_t *, pthread_mutex_t *);
-  int (*ptr___pthread_cond_timedwait) (pthread_cond_t *, pthread_mutex_t *,
-                                      const struct timespec *);
   int (*ptr_pthread_equal) (pthread_t, pthread_t);
   void (*ptr___pthread_exit) (void *);
   int (*ptr_pthread_getschedparam) (pthread_t, int *, struct sched_param *);
@@ -82,6 +81,8 @@ struct pthread_functions
                                struct sigaction *oact);
   int (*ptr_pthread_sigwait) (const sigset_t *set, int *sig);
   int (*ptr_pthread_raise) (int sig);
+  int (*ptr___pthread_cond_timedwait) (pthread_cond_t *, pthread_mutex_t *,
+                                      const struct timespec *);
 };
 
 /* Variable in libc.so.  */