From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 6 Oct 2004 09:25:03 +0000 (+0000)
Subject: 	* sysdeps/unix/sysv/linux/jmp-unwind.c: Include pthreadP.h instead
X-Git-Tag: cvs/fedora-glibc-2_3_3-66~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8802619dd44c1323b9c6d42ed73af7c5b77f33fb;p=thirdparty%2Fglibc.git

	* 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 f48085822c2..5d488cd1a5d 100644
--- 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 67350c21512..c435eff3079 100644
--- 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 f7d88f20e6b..36886f58a47 100644
--- 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