From: Mario Limonciello <mario_limonciello@dell.com>
Date: Thu, 29 Sep 2011 08:32:24 +0000 (+0200)
Subject: 	Remove extra declaration of sleep for mingw32.
X-Git-Tag: 2.00~1113
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cca7ccd8ff3bd697110c8f55b9e30b78662235f8;p=thirdparty%2Fgrub.git

	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 8cdd158cd..6e4aac746 100644
--- 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 48dfbb868..419c8661c 100644
--- 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 cfbae609b..e4425358a 100644
--- 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)
 {