diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-09-15 00:08:41 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-09-15 00:08:41 +0200 |
| commit | 401dd2dcdcd49f9df3f8759e2e3dc75a16b0de46 (patch) | |
| tree | c113937092c106f1e4d7e8753b6f434b4f4f4578 /sysdeps | |
| parent | a86a4a149b67a83d5c08238d0b802d372332bfba (diff) | |
| parent | 3def2cde1dc7e071976a174aa43ca076ae356a13 (diff) | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/libpthread
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/pt-attr-getschedparam.c | 1 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/ia32/pt-setup.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sysdeps/generic/pt-attr-getschedparam.c b/sysdeps/generic/pt-attr-getschedparam.c index 6c3f15be..190cf9d0 100644 --- a/sysdeps/generic/pt-attr-getschedparam.c +++ b/sysdeps/generic/pt-attr-getschedparam.c @@ -19,6 +19,7 @@ #include <pthread.h> #include <sched.h> +#include <string.h> #include <pt-internal.h> diff --git a/sysdeps/mach/hurd/ia32/pt-setup.c b/sysdeps/mach/hurd/ia32/pt-setup.c index ba438d6a..7eb223c2 100644 --- a/sysdeps/mach/hurd/ia32/pt-setup.c +++ b/sysdeps/mach/hurd/ia32/pt-setup.c @@ -64,7 +64,7 @@ stack_setup (struct __pthread *thread, { /* And then the call frame. */ top -= 2; - top = (uintptr_t) top & ~0xf; + top = (uintptr_t *) ((uintptr_t) top & ~0xf); top[1] = (uintptr_t) arg; /* Argument to START_ROUTINE. */ top[0] = (uintptr_t) start_routine; *--top = 0; /* Fake return address. */ |