* include/grub/emu/misc.h: Remove leftover cygwin definitions.

	Use windows path for DEFAULT_DIRECTORY.

diff --git a/ChangeLog b/ChangeLog
index 2f96092f9fc4f7a7171404dc119afa0524b693f3..ac63eafe0505641bea6782b66f69b6f11ead42c9 100644 (file)
--- 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 a31bc0f018bb68196c4b21d610c5560e8ec95e0f..e2ba8ee70292ef64e589a161724172c2c0f2e816 100644 (file)
--- 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