diff options
| author | Otto Moerbeek <otto@cvs.openbsd.org> | 2016-09-20 17:25:07 +0000 |
|---|---|---|
| committer | Otto Moerbeek <otto@cvs.openbsd.org> | 2016-09-20 17:25:07 +0000 |
| commit | 23043fc219569b9edf2842347ed528801781f417 (patch) | |
| tree | 665ccb56199f77b007870324e7b70cc7c6a1bce1 /regress/lib | |
| parent | 71f8a06567d506d560bbcc06456ef29613775e72 (diff) | |
switch master & slave; prompted by bluhm@
Diffstat (limited to 'regress/lib')
| -rw-r--r-- | regress/lib/libpthread/cancel/cancel.c | 4 | ||||
| -rw-r--r-- | regress/lib/libpthread/poll/poll.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/regress/lib/libpthread/cancel/cancel.c b/regress/lib/libpthread/cancel/cancel.c index cd68116b285..f602f7c4f53 100644 --- a/regress/lib/libpthread/cancel/cancel.c +++ b/regress/lib/libpthread/cancel/cancel.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cancel.c,v 1.8 2016/09/20 17:04:34 otto Exp $ */ +/* $OpenBSD: cancel.c,v 1.9 2016/09/20 17:25:06 otto Exp $ */ /* David Leonard <d@openbsd.org>, 1999. Public Domain. */ #include <pthread.h> @@ -57,7 +57,7 @@ child1fn(void *arg) SET_NAME("c1"); CHECKr(pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL)); /* something that will block */ - CHECKe(openpty(&fd, &dummy, NULL, NULL, NULL)); + CHECKe(openpty(&dummy, &fd, NULL, NULL, NULL)); pthread_cleanup_push(c1handler, (void *)&fd); v(); while (1) { diff --git a/regress/lib/libpthread/poll/poll.c b/regress/lib/libpthread/poll/poll.c index 979d2916d9a..687564c330c 100644 --- a/regress/lib/libpthread/poll/poll.c +++ b/regress/lib/libpthread/poll/poll.c @@ -1,4 +1,4 @@ -/* $OpenBSD: poll.c,v 1.5 2016/09/20 17:04:35 otto Exp $ */ +/* $OpenBSD: poll.c,v 1.6 2016/09/20 17:25:06 otto Exp $ */ /* David Leonard <d@openbsd.org>, 2001. Public Domain. */ #include <pthread.h> @@ -64,7 +64,7 @@ main(int argc, char *argv[]) CHECKe(zero = open(_PATH_DEV "zero", O_RDONLY)); CHECKe(null = open(_PATH_DEV "null", O_WRONLY)); - CHECKe(openpty(&tty, &dummy, NULL, NULL, NULL)); + CHECKe(openpty(&dummy, &tty, NULL, NULL, NULL)); /* Try both descriptors being ready */ p[0].fd = zero; |