From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1R6TjQ-0004nQ-L0 for mharc-grub-devel@gnu.org; Wed, 21 Sep 2011 16:49:24 -0400 Received: from eggs.gnu.org ([140.186.70.92]:44303) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6TjO-0004er-AE for grub-devel@gnu.org; Wed, 21 Sep 2011 16:49:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R6TjM-0006IU-QV for grub-devel@gnu.org; Wed, 21 Sep 2011 16:49:22 -0400 Received: from ausc60pc101.us.dell.com ([143.166.85.206]:20783) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6TjM-0006G8-N3 for grub-devel@gnu.org; Wed, 21 Sep 2011 16:49:20 -0400 X-Loopcount0: from 10.9.160.253 Message-ID: <4E7A4DD2.1010704@dell.com> Date: Wed, 21 Sep 2011 15:49:22 -0500 From: Mario Limonciello Organization: Dell Inc. User-Agent: Mozilla/5.0 (X11; Linux i686; rv:6.0.2) Gecko/20110906 Thunderbird/6.0.2 MIME-Version: 1.0 To: "grub-devel@gnu.org" Subject: [PATCH 1/3] Remove extra declaration of sleep for mingw32. Content-Type: multipart/mixed; boundary="------------070306020407080100080401" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 143.166.85.206 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Sep 2011 20:49:23 -0000 This is a multi-part message in MIME format. --------------070306020407080100080401 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 8bit === 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 + + * Remove extra declaration of sleep for mingw32. + 2011-09-17 Grégoire Sutre * 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) { --------------070306020407080100080401 Content-Type: text/x-diff; name="ml_3425.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="ml_3425.patch" === 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 + + * Remove extra declaration of sleep for mingw32. + 2011-09-17 Grégoire Sutre * 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) { --------------070306020407080100080401--