* grub-core/commands/macbless.c: Rename FILE and DIR to avoid

	conflicts.

	Reported by: Andrey Borzenkov.

diff --git a/ChangeLog b/ChangeLog
index dad469b43b1f6410676000dc3dc812a7765a8c61..9d1a3f051c1461c10273c694ff83663a5a1afea7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-01-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/commands/macbless.c: Rename FILE and DIR to avoid
+       conflicts.
+
+       Reported by: Andrey Borzenkov.
+
 2014-01-18  Andrey Borzenkov <arvidjaar@gmail.com>
 
        * include/grub/misc.h: Move macros for compiler features to ...

diff --git a/grub-core/commands/macbless.c b/grub-core/commands/macbless.c
index c5210833ed0c2827143b339eab5205cef31709a3..4724edd770987072bde19e7f9caee348c92f9b2c 100644 (file)
--- a/grub-core/commands/macbless.c
+++ b/grub-core/commands/macbless.c
@@ -37,7 +37,7 @@ struct find_node_context
   grub_uint64_t inode_found;
   char *dirname;
   enum
-  { NONE, FILE, DIR } found;
+  { FOUND_NONE, FOUND_FILE, FOUND_DIR } found;
 };
 
 static int
@@ -53,7 +53,7 @@ find_inode (const char *filename,
           && grub_strcasecmp (ctx->dirname, filename) == 0)))
     {
       ctx->inode_found = info->inode;
-      ctx->found = info->dir ? DIR : FILE;
+      ctx->found = info->dir ? FOUND_DIR : FOUND_FILE;
     }
   return 0;
 }
@@ -175,7 +175,7 @@ grub_mac_bless_file (grub_device_t dev, const char *path_in, int intel)
   grub_free (path);
 
   return grub_mac_bless_inode (dev, (grub_uint32_t) ctx.inode_found,
-                              (ctx.found == DIR), intel);
+                              (ctx.found == FOUND_DIR), intel);
 }
 
 static grub_err_t