From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 23 Sep 2013 09:24:10 +0000 (+0200)
Subject: 	* include/grub/emu/misc.h: Remove leftover cygwin definitions.
X-Git-Tag: grub-2.02-beta1~833
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e85a5d5ca61b822567c572af2b6951abe45860f9;p=thirdparty%2Fgrub.git

	* include/grub/emu/misc.h: Remove leftover cygwin definitions.
	Use windows path for DEFAULT_DIRECTORY.
---

diff --git a/ChangeLog b/ChangeLog
index 2f96092f9..ac63eafe0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/emu/misc.h: Remove leftover cygwin definitions.
+	Use windows path for DEFAULT_DIRECTORY.
+
 2013-09-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/i386/setjmp.h: Remove useless #if MINGW where original
diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
index a31bc0f01..e2ba8ee70 100644
--- a/include/grub/emu/misc.h
+++ b/include/grub/emu/misc.h
@@ -25,14 +25,9 @@
 #include <grub/symbol.h>
 #include <grub/types.h>
 
-#ifdef __CYGWIN__
-# include <sys/fcntl.h>
-# include <sys/cygwin.h>
-# include <limits.h>
-# define DEV_CYGDRIVE_MAJOR 98
-#endif
-
-#ifdef __NetBSD__
+#if defined __CYGWIN__ || defined (__MINGW32__)
+# define DEFAULT_DIRECTORY	"C:\\"GRUB_BOOT_DIR_NAME"\\"GRUB_DIR_NAME
+#elif defined (__NetBSD__)
 /* NetBSD uses /boot for its boot block.  */
 # define DEFAULT_DIRECTORY	"/"GRUB_DIR_NAME
 #else