diff options
author | Jakub Jelinek <jakub@redhat.com> | 2006-01-02 10:52:59 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2006-01-02 10:52:59 +0000 |
commit | 0db2497936950725ae71e997091ef276a3ec43ee (patch) | |
tree | 7d66db137accea00fe402dfabf8e5de3a4af58c6 /hurd | |
parent | b9ea6c38033d6ab0bda9dddb34cc7a4c6ff82084 (diff) | |
download | glibc-0db2497936950725ae71e997091ef276a3ec43ee.tar.gz |
Updated to fedora-glibc-20060102T1045
Diffstat (limited to 'hurd')
-rw-r--r-- | hurd/lookup-retry.c | 4 | ||||
-rw-r--r-- | hurd/report-wait.c | 2 | ||||
-rw-r--r-- | hurd/sigunwind.c | 11 |
3 files changed, 13 insertions, 4 deletions
diff --git a/hurd/lookup-retry.c b/hurd/lookup-retry.c index 1f53f911a7..0a886229f0 100644 --- a/hurd/lookup-retry.c +++ b/hurd/lookup-retry.c @@ -1,5 +1,5 @@ /* hairy bits of Hurd file name lookup - Copyright (C) 1992,1993,1994,1995,1996,1997,1999,2001,2002,2003 + Copyright (C) 1992,1993,1994,1995,1996,1997,1999,2001,2002,2003,2005 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -247,7 +247,7 @@ __hurd_file_name_lookup_retry (error_t (*use_init_port) char *p; /* XXX want client's host */ if (err = __host_info (__mach_host_self (), HOST_BASIC_INFO, - (natural_t *) &hostinfo, + (integer_t *) &hostinfo, &hostinfocnt)) return err; if (hostinfocnt != HOST_BASIC_INFO_COUNT) diff --git a/hurd/report-wait.c b/hurd/report-wait.c index da0ca3bdb2..296b2eec42 100644 --- a/hurd/report-wait.c +++ b/hurd/report-wait.c @@ -140,7 +140,7 @@ _S_msg_report_wait (mach_port_t msgport, thread_t thread, error_t err; err = __thread_get_state (thread, MACHINE_THREAD_STATE_FLAVOR, - (integer_t *) &state, &count); + (natural_t *) &state, &count); if (err) return err; assert (count == MACHINE_THREAD_STATE_COUNT); diff --git a/hurd/sigunwind.c b/hurd/sigunwind.c index 2231518bd0..67f78c1ce5 100644 --- a/hurd/sigunwind.c +++ b/hurd/sigunwind.c @@ -21,6 +21,7 @@ #include <thread_state.h> #include <setjmp.h> #include <assert.h> +#include <stdint.h> /* _hurd_setup_sighandler puts a link on the `active resources' chain so that @@ -70,11 +71,19 @@ _hurdsig_longjmp_from_handler (void *data, jmp_buf env, int val) struct hurd_userlink *link; + inline uintptr_t demangle_ptr (uintptr_t x) + { +# ifdef PTR_DEMANGLE + PTR_DEMANGLE (x); +# endif + return x; + } + /* Continue _longjmp_unwind's job of running the unwind forms for frames being unwound, since we will not return to its loop like this one, which called us. */ for (link = ss->active_resources; - link && _JMPBUF_UNWINDS (env[0].__jmpbuf, link); + link && _JMPBUF_UNWINDS (env[0].__jmpbuf, link, demangle_ptr); link = link->thread.next) if (_hurd_userlink_unlink (link)) { |