Blame SOURCES/0028-grub-core-commands-macbless.c-Rename-FILE-and-DIR-to.patch

f731ee
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
f731ee
From: Vladimir Serbinenko <phcoder@gmail.com>
f731ee
Date: Sat, 18 Jan 2014 19:26:40 +0100
f731ee
Subject: [PATCH] * grub-core/commands/macbless.c: Rename FILE and DIR to avoid
f731ee
 conflicts.
f731ee
f731ee
	Reported by: Andrey Borzenkov.
f731ee
---
f731ee
 grub-core/commands/macbless.c | 6 +++---
f731ee
 ChangeLog                     | 7 +++++++
f731ee
 2 files changed, 10 insertions(+), 3 deletions(-)
f731ee
f731ee
diff --git a/grub-core/commands/macbless.c b/grub-core/commands/macbless.c
f731ee
index c5210833ed0..4724edd7709 100644
f731ee
--- a/grub-core/commands/macbless.c
f731ee
+++ b/grub-core/commands/macbless.c
f731ee
@@ -37,7 +37,7 @@ struct find_node_context
f731ee
   grub_uint64_t inode_found;
f731ee
   char *dirname;
f731ee
   enum
f731ee
-  { NONE, FILE, DIR } found;
f731ee
+  { FOUND_NONE, FOUND_FILE, FOUND_DIR } found;
f731ee
 };
f731ee
 
f731ee
 static int
f731ee
@@ -53,7 +53,7 @@ find_inode (const char *filename,
f731ee
 	   && grub_strcasecmp (ctx->dirname, filename) == 0)))
f731ee
     {
f731ee
       ctx->inode_found = info->inode;
f731ee
-      ctx->found = info->dir ? DIR : FILE;
f731ee
+      ctx->found = info->dir ? FOUND_DIR : FOUND_FILE;
f731ee
     }
f731ee
   return 0;
f731ee
 }
f731ee
@@ -175,7 +175,7 @@ grub_mac_bless_file (grub_device_t dev, const char *path_in, int intel)
f731ee
   grub_free (path);
f731ee
 
f731ee
   return grub_mac_bless_inode (dev, (grub_uint32_t) ctx.inode_found,
f731ee
-			       (ctx.found == DIR), intel);
f731ee
+			       (ctx.found == FOUND_DIR), intel);
f731ee
 }
f731ee
 
f731ee
 static grub_err_t
f731ee
diff --git a/ChangeLog b/ChangeLog
f731ee
index dad469b43b1..9d1a3f051c1 100644
f731ee
--- a/ChangeLog
f731ee
+++ b/ChangeLog
f731ee
@@ -1,3 +1,10 @@
f731ee
+2014-01-18  Vladimir Serbinenko  <phcoder@gmail.com>
f731ee
+
f731ee
+	* grub-core/commands/macbless.c: Rename FILE and DIR to avoid
f731ee
+	conflicts.
f731ee
+
f731ee
+	Reported by: Andrey Borzenkov.
f731ee
+
f731ee
 2014-01-18  Andrey Borzenkov <arvidjaar@gmail.com>
f731ee
 
f731ee
 	* include/grub/misc.h: Move macros for compiler features to ...