* util/getroot_unix.c [__MINGW32__ || __CYGWIN__]:

	Define dummy grub_util_pull_lvm_by_command to decrease number of #if's.

diff --git a/ChangeLog b/ChangeLog
index 54684fe510a289f4ea77fe165380106232abf756..8d95254d975ddc589a52ba88c7fbaa99750f98c1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2013-09-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/getroot_unix.c [__MINGW32__ || __CYGWIN__]:
+       Define dummy grub_util_pull_lvm_by_command to decrease number of #if's.
+
+2013-09-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/lib/posix_wrap/sys/types.h: Use OpenBSD approach: it's
+       less nice but more portable.
+       * grub-core/lib/posix_wrap/wchar.h: Likewise.
+
 2013-09-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * include/grub/cryptodisk.h (grub_cryptodisk): Use grub_util_fd_t

diff --git a/include/grub/emu/getroot.h b/include/grub/emu/getroot.h
index bbba7308cec423068e4e1390bae935f20f0fb3d7..8762788b7851f5acd61969bcafa5b95dc51e732e 100644 (file)
--- a/include/grub/emu/getroot.h
+++ b/include/grub/emu/getroot.h
@@ -79,9 +79,9 @@ grub_util_get_devmapper_grub_dev (const char *os_dev);
 #include <sys/types.h>
 pid_t
 grub_util_exec_pipe (char **argv, int *fd);
+#endif
 void
 grub_util_pull_lvm_by_command (const char *os_dev);
-#endif
 char **
 grub_util_find_root_devices_from_poolname (char *poolname);
 

diff --git a/util/getroot.c b/util/getroot.c
index 8673ede5f92c0e704dcc7437724bed63e7eccdb4..1e8bddc934112bb603501fba789abdcc8a1aa156 100644 (file)
--- a/util/getroot.c
+++ b/util/getroot.c
@@ -119,9 +119,7 @@ grub_util_pull_device (const char *os_dev)
   switch (ab)
     {
     case GRUB_DEV_ABSTRACTION_LVM:
-#if !defined (__MINGW32__) && !defined (__CYGWIN__)
       grub_util_pull_lvm_by_command (os_dev);
-#endif
       /* Fallthrough in case that lvm-tools are unavailable.  */
     case GRUB_DEV_ABSTRACTION_LUKS:
       grub_util_pull_devmapper (os_dev);

diff --git a/util/getroot_unix.c b/util/getroot_unix.c
index bdf60f0402eea6100f203345ed5c6eeb8f24de0a..079f91628eab52db48cbcccdd94c597cf73c7930 100644 (file)
--- a/util/getroot_unix.c
+++ b/util/getroot_unix.c
@@ -928,4 +928,11 @@ grub_util_biosdisk_is_floppy (grub_disk_t disk)
   return 0;
 }
 
+#else
+
+void
+grub_util_pull_lvm_by_command (const char *os_dev __attribute__ ((unused)))
+{
+}
+
 #endif