diff options
| author | David Xu <davidxu@FreeBSD.org> | 2010-09-30 12:59:56 +0000 |
|---|---|---|
| committer | David Xu <davidxu@FreeBSD.org> | 2010-09-30 12:59:56 +0000 |
| commit | 722488013da35a056aa16b67a7b3a14b9b1ac2ac (patch) | |
| tree | c7c77c7d4dea6e1fa23cdb01c5665504ca77aff3 | |
| parent | da1eef674baa14c026d4a63bee2aa4f848c7ef27 (diff) | |
Notes
| -rw-r--r-- | lib/libthr/thread/thr_exit.c | 8 | ||||
| -rw-r--r-- | lib/libthr/thread/thr_private.h | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lib/libthr/thread/thr_exit.c b/lib/libthr/thread/thr_exit.c index 0dc7e2d1dba6..7001311e6d89 100644 --- a/lib/libthr/thread/thr_exit.c +++ b/lib/libthr/thread/thr_exit.c @@ -58,13 +58,13 @@ static void thread_unwind(void) __dead2; static void thread_uw_init(void); static _Unwind_Reason_Code thread_unwind_stop(int version, _Unwind_Action actions, - _Unwind_Exception_Class exc_class, + int64_t exc_class, struct _Unwind_Exception *exc_obj, struct _Unwind_Context *context, void *stop_parameter); /* unwind library pointers */ static _Unwind_Reason_Code (*uwl_forcedunwind)(struct _Unwind_Exception *, _Unwind_Stop_Fn, void *); -static _Unwind_Word (*uwl_getcfa)(struct _Unwind_Context *); +static unsigned long (*uwl_getcfa)(struct _Unwind_Context *); static void thread_uw_init(void) @@ -106,7 +106,7 @@ _Unwind_ForcedUnwind(struct _Unwind_Exception *ex, _Unwind_Stop_Fn stop_func, return (*uwl_forcedunwind)(ex, stop_func, stop_arg); } -_Unwind_Word +unsigned long _Unwind_GetCFA(struct _Unwind_Context *context) { return (*uwl_getcfa)(context); @@ -129,7 +129,7 @@ thread_unwind_cleanup(_Unwind_Reason_Code code, struct _Unwind_Exception *e) static _Unwind_Reason_Code thread_unwind_stop(int version, _Unwind_Action actions, - _Unwind_Exception_Class exc_class, + int64_t exc_class, struct _Unwind_Exception *exc_obj, struct _Unwind_Context *context, void *stop_parameter) { diff --git a/lib/libthr/thread/thr_private.h b/lib/libthr/thread/thr_private.h index efd03a9566a5..aa9feefcf7d3 100644 --- a/lib/libthr/thread/thr_private.h +++ b/lib/libthr/thread/thr_private.h @@ -71,7 +71,8 @@ #include "thread_db.h" #ifdef _PTHREAD_FORCED_UNWIND -#include <unwind-generic.h> +#define _BSD_SOURCE +#include <unwind.h> #endif typedef TAILQ_HEAD(pthreadlist, pthread) pthreadlist; |