Libc-1044.1.2.tar.gz

[apple/libc.git] / gen / FreeBSD / sleep.c

diff --git a/gen/FreeBSD/sleep.c b/gen/FreeBSD/sleep.c
index bd48358ccd0f7506590f9abb00af68bf6bd59e79..a04789da6376f537ffb9b58f0cb6672f1b0d5931 100644 (file)
--- a/gen/FreeBSD/sleep.c
+++ b/gen/FreeBSD/sleep.c
@@ -10,10 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -31,11 +27,15 @@
  * SUCH DAMAGE.
  */
 
+#if defined(VARIANT_CANCELABLE) && __DARWIN_NON_CANCELABLE != 0
+#error cancellable call vs. __DARWIN_NON_CANCELABLE mismatch
+#endif
+
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)sleep.c    8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/sleep.c,v 1.31 2002/02/01 00:57:29 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/sleep.c,v 1.33 2009/12/05 19:31:38 ed Exp $");
 
 #include "namespace.h"
 #include <errno.h>
@@ -45,8 +45,7 @@ __FBSDID("$FreeBSD: src/lib/libc/gen/sleep.c,v 1.31 2002/02/01 00:57:29 obrien E
 #include "un-namespace.h"
 
 unsigned int
-__sleep(seconds)
-       unsigned int seconds;
+__sleep(unsigned int seconds)
 {
        struct timespec time_to_sleep;
        struct timespec time_remaining;