diff options
author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-11-18 03:14:53 +0000 |
---|---|---|
committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-11-18 03:14:53 +0000 |
commit | f87c7bd4133a2b3ad9b45c32fab33d167a348c4b (patch) | |
tree | 7259957b97704c375b3d8ab42f8da3d52665845e /libc/signal/sigwait.c | |
parent | 164a928b77f596b6617a4bbf43a2c06bc35a5602 (diff) | |
download | uClibc-alpine-f87c7bd4133a2b3ad9b45c32fab33d167a348c4b.tar.bz2 uClibc-alpine-f87c7bd4133a2b3ad9b45c32fab33d167a348c4b.tar.xz |
Massive merge from trunk.
Diffstat (limited to 'libc/signal/sigwait.c')
-rw-r--r-- | libc/signal/sigwait.c | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/libc/signal/sigwait.c b/libc/signal/sigwait.c index 9cd2b6d12..99ddfc481 100644 --- a/libc/signal/sigwait.c +++ b/libc/signal/sigwait.c @@ -3,31 +3,35 @@ * * Copyright (C) 2003 by Erik Andersen <andersen@uclibc.org> * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU Library General Public License as published by - * the Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License - * for more details. + * The GNU C Library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ + * You should have received a copy of the GNU Lesser General Public + * License along with the GNU C Library; if not, write to the Free + * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + * 02111-1307 USA. */ #include <errno.h> #include <signal.h> #include <string.h> -int sigwait (const sigset_t *set, int *sig) +#undef sigwait +int attribute_hidden __sigwait (const sigset_t *set, int *sig) { - int ret = 1; - if ((ret = sigwaitinfo(set, NULL)) != -1) { - *sig = ret; - return 0; - } - return 1; + int ret = 1; + if ((ret = sigwaitinfo(set, NULL)) != -1) { + *sig = ret; + return 0; + } + return 1; } + +/* psm: keep this weak, because the one in libpthread.so could overwrite it */ +weak_alias(__sigwait, sigwait) |