From e85a5d5ca61b822567c572af2b6951abe45860f9 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Mon, 23 Sep 2013 11:24:10 +0200 Subject: [PATCH] * include/grub/emu/misc.h: Remove leftover cygwin definitions. Use windows path for DEFAULT_DIRECTORY. --- ChangeLog | 5 +++++ include/grub/emu/misc.h | 11 +++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2f96092f9..ac63eafe0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-09-23 Vladimir Serbinenko + + * include/grub/emu/misc.h: Remove leftover cygwin definitions. + Use windows path for DEFAULT_DIRECTORY. + 2013-09-23 Vladimir Serbinenko * 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 #include -#ifdef __CYGWIN__ -# include -# include -# include -# 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