diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2010-08-01 01:06:13 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2010-08-01 01:06:13 +0200 |
| commit | 8a42f9a3ff374eab8dec61b1d4eb8567a2a91ade (patch) | |
| tree | ef4b3d43559f4f6455f70ef04fc853a05d3ff823 /libpthread/pthread | |
| parent | 68567b88ee8f9e395e0c1f0a565affe8a1d4d68b (diff) | |
| parent | 90dd2d73435a8e1bbcccf5ed99a91b2c438557f4 (diff) | |
Merge branch 'libpthread' into libpthread-moved
Diffstat (limited to 'libpthread/pthread')
| -rw-r--r-- | libpthread/pthread/pt-setcancelstate.c | 3 | ||||
| -rw-r--r-- | libpthread/pthread/pt-setcanceltype.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libpthread/pthread/pt-setcancelstate.c b/libpthread/pthread/pt-setcancelstate.c index ded58922..e2d81833 100644 --- a/libpthread/pthread/pt-setcancelstate.c +++ b/libpthread/pthread/pt-setcancelstate.c @@ -35,7 +35,8 @@ pthread_setcancelstate (int state, int *oldstate) break; } - *oldstate = p->cancel_state; + if (oldstate) + *oldstate = p->cancel_state; p->cancel_state = state; return 0; diff --git a/libpthread/pthread/pt-setcanceltype.c b/libpthread/pthread/pt-setcanceltype.c index 9511c991..3ce4259c 100644 --- a/libpthread/pthread/pt-setcanceltype.c +++ b/libpthread/pthread/pt-setcanceltype.c @@ -35,7 +35,8 @@ pthread_setcanceltype (int type, int *oldtype) break; } - *oldtype = p->cancel_type; + if (oldtype) + *oldtype = p->cancel_type; p->cancel_type = type; return 0; |