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 | 3a931fd6e0d8212fa3d84554cb35f55e62f2dc52 (patch) | |
| tree | 936e8c83f99d58b73fb49a41516b75fa5aa8c298 /sysdeps | |
| parent | 5288bf31ee255aafe394304074c1ec6ccb290448 (diff) | |
| parent | 769e2108a0f5fc49eff9f3addbaf5f0646bcb253 (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 6c3f15b..190cf9d 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 ba438d6..7eb223c 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. */ |