From 7dfaf230d2191da71f3078943ea09d014298e7b0 Mon Sep 17 00:00:00 2001
From: "\"Steven J. Hill\"" <sjhill@realitydiluted.com>
Date: Sat, 16 Dec 2006 04:54:52 +0000
Subject: Merge from trunk.

---
 libpthread/linuxthreads.old/internals.h | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to 'libpthread/linuxthreads.old/internals.h')

diff --git a/libpthread/linuxthreads.old/internals.h b/libpthread/linuxthreads.old/internals.h
index 17b724e64..ab227d6cc 100644
--- a/libpthread/linuxthreads.old/internals.h
+++ b/libpthread/linuxthreads.old/internals.h
@@ -24,6 +24,7 @@
 #include <setjmp.h>
 #include <signal.h>
 #include <unistd.h>
+#include <bits/stackinfo.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include "pt-machine.h"
@@ -445,21 +446,12 @@ static inline pthread_descr thread_self (void)
 extern int __libc_multiple_threads attribute_hidden;
 extern int __librt_multiple_threads;
 
-/* Debugging */
-
-#ifdef DEBUG
-#include <assert.h>
-#define ASSERT assert
-#define MSG __pthread_message
-#else
-#define ASSERT(x)
-#define MSG(msg,arg...)
-#endif
-
 /* Internal global functions */
 
+void __pthread_do_exit (void *retval, char *currentframe)
+     __attribute__ ((__noreturn__));
 void __pthread_destroy_specifics(void);
-void __pthread_perform_cleanup(void);
+void __pthread_perform_cleanup(char *currentframe);
 int __pthread_initialize_manager(void);
 void __pthread_message(char * fmt, ...);
 int __pthread_manager(void *reqfd);
-- 
cgit v1.2.3