Fix prototype of sleep() and move it to unistd.h

diff --git a/src/core/misc.c b/src/core/misc.c
index c80eacdde2cce813d45fb7f090516566cc05ce11..3930d265acbd41379ee452c517836efac2e8c036 100644 (file)
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -75,12 +75,13 @@ int32_t random(void)
 /**************************************************************************
 SLEEP
 **************************************************************************/
-void sleep(int secs)
+unsigned int sleep(unsigned int secs)
 {
        unsigned long tmo;
 
        for (tmo = currticks()+secs*TICKS_PER_SEC; currticks() < tmo; ) {
        }
+       return 0;
 }
 
 /**************************************************************************
@@ -89,7 +90,7 @@ INTERRUPTIBLE SLEEP
 void interruptible_sleep(int secs)
 {
        printf("<sleep>\n");
-       return sleep(secs);
+       sleep(secs);
 }
 
 /**************************************************************************

diff --git a/src/include/etherboot.h b/src/include/etherboot.h
index e5a1815368ad4151d6b1d0464e4360fc556c18dc..b26379c265837db258f3b261d0a4a29a03be7203 100644 (file)
--- a/src/include/etherboot.h
+++ b/src/include/etherboot.h
@@ -9,6 +9,7 @@
 #include "compiler.h"
 #include "stddef.h"
 #include "stdint.h"
+#include <unistd.h>
 
 
 /*
@@ -220,7 +221,6 @@ extern int load_block P((unsigned char *, unsigned int, unsigned int, int ));
 
 /* misc.c */
 extern void twiddle P((void));
-extern void sleep P((int secs));
 extern void interruptible_sleep P((int secs));
 extern int strcasecmp P((const char *a, const char *b));
 extern char *substr P((const char *a, const char *b));

diff --git a/src/include/unistd.h b/src/include/unistd.h
index f3412d400edd330562b748e1907bb9c1e292ef12..35dcf58457acb673456453e44bbf7df3c424d216 100644 (file)
--- a/src/include/unistd.h
+++ b/src/include/unistd.h
@@ -4,6 +4,7 @@
 #include <stddef.h>
 #include <stdarg.h>
 
+extern unsigned int sleep ( unsigned int seconds );
 extern int execv ( const char *command, char * const argv[] );
 
 /**