[PATCH 1/3] Remove extra declaration of sleep for mingw32.

[PATCH 1/3] Remove extra declaration of sleep for mingw32.

[Mario Limonciello]

[-- Attachment #1: Type: text/plain, Size: 955 bytes --]

=== modified file 'ChangeLog'
--- ChangeLog   2011-09-17 21:40:10 +0000
+++ ChangeLog   2011-09-21 20:36:50 +0000
@@ -1,3 +1,7 @@
+2011-09-21  Mario Limonciello <mario_limonciello@dell.com>
+
+       * Remove extra declaration of sleep for mingw32.
+
  2011-09-17  Grégoire Sutre <gregoire.sutre@gmail.com>

         * Makefile.util.def (grub-mkrelpath): Add LIBUTIL for getrawpartition(3)

=== modified file 'include/grub/util/misc.h'
--- include/grub/util/misc.h    2010-08-19 11:24:00 +0000
+++ include/grub/util/misc.h    2011-09-21 20:36:50 +0000
@@ -47,7 +47,6 @@

  void sync (void);
  int fsync (int fno);
-void sleep(int s);

  grub_int64_t grub_util_get_disk_size (char *name);


=== modified file 'util/misc.c'
--- util/misc.c 2010-08-23 17:56:24 +0000
+++ util/misc.c 2011-09-21 20:36:50 +0000
@@ -316,11 +316,6 @@
    return 0;
  }

-void sleep (int s)
-{
-  Sleep (s * 1000);
-}
-
  grub_int64_t
  grub_util_get_disk_size (char *name)
  {



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: ml_3425.patch --]
[-- Type: text/x-diff; name="ml_3425.patch", Size: 929 bytes --]

=== modified file 'ChangeLog'
--- ChangeLog	2011-09-17 21:40:10 +0000
+++ ChangeLog	2011-09-21 20:36:50 +0000
@@ -1,3 +1,7 @@
+2011-09-21  Mario Limonciello <mario_limonciello@dell.com>
+
+	* Remove extra declaration of sleep for mingw32.
+
 2011-09-17  Grégoire Sutre  <gregoire.sutre@gmail.com>
 
 	* Makefile.util.def (grub-mkrelpath): Add LIBUTIL for getrawpartition(3)

=== modified file 'include/grub/util/misc.h'
--- include/grub/util/misc.h	2010-08-19 11:24:00 +0000
+++ include/grub/util/misc.h	2011-09-21 20:36:50 +0000
@@ -47,7 +47,6 @@
 
 void sync (void);
 int fsync (int fno);
-void sleep(int s);
 
 grub_int64_t grub_util_get_disk_size (char *name);
 

=== modified file 'util/misc.c'
--- util/misc.c	2010-08-23 17:56:24 +0000
+++ util/misc.c	2011-09-21 20:36:50 +0000
@@ -316,11 +316,6 @@
   return 0;
 }
 
-void sleep (int s)
-{
-  Sleep (s * 1000);
-}
-
 grub_int64_t
 grub_util_get_disk_size (char *name)
 {

Re: [PATCH 1/3] Remove extra declaration of sleep for mingw32.

[Vladimir 'φ-coder/phcoder' Serbinenko]

[-- Attachment #1: Type: text/plain, Size: 1441 bytes --]

Committed. Thanks. Note that your Changelog format was wrong. See the
actual commit on how to do it correctly.
On 21.09.2011 22:49, Mario Limonciello wrote:
> === modified file 'ChangeLog'
> --- ChangeLog   2011-09-17 21:40:10 +0000
> +++ ChangeLog   2011-09-21 20:36:50 +0000
> @@ -1,3 +1,7 @@
> +2011-09-21  Mario Limonciello <mario_limonciello@dell.com>
> +
> +       * Remove extra declaration of sleep for mingw32.
> +
>  2011-09-17  Grégoire Sutre <gregoire.sutre@gmail.com>
>
>         * Makefile.util.def (grub-mkrelpath): Add LIBUTIL for
> getrawpartition(3)
>
> === modified file 'include/grub/util/misc.h'
> --- include/grub/util/misc.h    2010-08-19 11:24:00 +0000
> +++ include/grub/util/misc.h    2011-09-21 20:36:50 +0000
> @@ -47,7 +47,6 @@
>
>  void sync (void);
>  int fsync (int fno);
> -void sleep(int s);
>
>  grub_int64_t grub_util_get_disk_size (char *name);
>
>
> === modified file 'util/misc.c'
> --- util/misc.c 2010-08-23 17:56:24 +0000
> +++ util/misc.c 2011-09-21 20:36:50 +0000
> @@ -316,11 +316,6 @@
>    return 0;
>  }
>
> -void sleep (int s)
> -{
> -  Sleep (s * 1000);
> -}
> -
>  grub_int64_t
>  grub_util_get_disk_size (char *name)
>  {
>
>
>
> _______________________________________________
> Grub-devel mailing list
> Grub-devel@gnu.org
> https://lists.gnu.org/mailman/listinfo/grub-devel


-- 
Regards
Vladimir 'φ-coder/phcoder' Serbinenko



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 294 bytes --]