* sysdeps/unix/sysv/linux/jmp-unwind.c: Include pthreadP.h instead

	of pthread-functions.h and pthreaddef.h.
	* sysdeps/unix/sysv/linux/s390/jmp-unwind.c: Likewise.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index f48085822c2332a99e14b52edca239e748ca30f1..5d488cd1a5daf4c52e7c5ab1e2f1f4516fbce2cf 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,9 @@
 2004-10-06  Jakub Jelinek  <jakub@redhat.com>
 
+       * sysdeps/unix/sysv/linux/jmp-unwind.c: Include pthreadP.h instead
+       of pthread-functions.h and pthreaddef.h.
+       * sysdeps/unix/sysv/linux/s390/jmp-unwind.c: Likewise.
+
        * sysdeps/s390/jmpbuf-unwind.h: Include bits/wordsize.h.
        (JMPBUF_CFA_UNWINDS_ADJ): Subtract 96 resp. 160 bytes from
        CFA.

diff --git a/nptl/sysdeps/unix/sysv/linux/jmp-unwind.c b/nptl/sysdeps/unix/sysv/linux/jmp-unwind.c
index 67350c21512de513c6d5a7ebc2e77d4dcbfc6be1..c435eff30795c2582fa0f1488a421ac44772142f 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/jmp-unwind.c
+++ b/nptl/sysdeps/unix/sysv/linux/jmp-unwind.c
@@ -19,8 +19,7 @@
 
 #include <setjmp.h>
 #include <stddef.h>
-#include <pthread-functions.h>
-#include <pthreaddef.h>
+#include <pthreadP.h>
 
 extern void __pthread_cleanup_upto (__jmp_buf env, char *targetframe);
 #pragma weak __pthread_cleanup_upto

diff --git a/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c b/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c
index f7d88f20e6b5526df0e3c290937bbf4f0b75ad5f..36886f58a47cffc6855aa2e08176c1f4a6a90c92 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c
+++ b/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c
@@ -1,5 +1,5 @@
 /* Clean up stack frames unwound by longjmp.  Linux/s390 version.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -19,8 +19,7 @@
 
 #include <setjmp.h>
 #include <stddef.h>
-#include <pthread-functions.h>
-#include <pthreaddef.h>
+#include <pthreadP.h>
 
 extern void __pthread_cleanup_upto (__jmp_buf env, char *targetframe);
 #pragma weak __pthread_cleanup_upto