Remove extra declaration of sleep for mingw32.

	* util/misc.c (sleep) [__MINGW32__]: Removed.
	* include/grub/util/misc.h (sleep) [__MINGW32__]: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 8cdd158cd45b30bc61402db8a3f6e3fe0ecc09f8..6e4aac7465033693b55552ca4e8a90b8399a7d1a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-09-29  Mario Limonciello <mario_limonciello@dell.com>
+
+       Remove extra declaration of sleep for mingw32.
+
+       * util/misc.c (sleep) [__MINGW32__]: Removed.
+       * include/grub/util/misc.h (sleep) [__MINGW32__]: Likewise.
+
 2011-09-28  Grégoire Sutre  <gregoire.sutre@gmail.com>
 
        * include/grub/bsdlabel.h (grub_partition_bsd_disk_label): Add fields

diff --git a/include/grub/util/misc.h b/include/grub/util/misc.h
index 48dfbb8686db9353616a2a92a19e3192d3bdb374..419c8661cc1e1db16a32a67c9ad8ba336c92508d 100644 (file)
--- a/include/grub/util/misc.h
+++ b/include/grub/util/misc.h
@@ -47,7 +47,6 @@ void grub_util_write_image_at (const void *img, size_t size, off_t offset,
 
 void sync (void);
 int fsync (int fno);
-void sleep(int s);
 
 grub_int64_t grub_util_get_disk_size (char *name);
 

diff --git a/util/misc.c b/util/misc.c
index cfbae609b711a03e40003d6f223ded0c244a4111..e4425358a03aab34893c2cd5b54bc7a4c44a07df 100644 (file)
--- a/util/misc.c
+++ b/util/misc.c
@@ -316,11 +316,6 @@ int fsync (int fno __attribute__ ((unused)))
   return 0;
 }
 
-void sleep (int s)
-{
-  Sleep (s * 1000);
-}
-
 grub_int64_t
 grub_util_get_disk_size (char *name)
 {