a5bd9f6
From aa3830c409ca40e6f0b71279ddb3409262a7bd96 Mon Sep 17 00:00:00 2001
a5bd9f6
From: Leif Lindholm  <leif.lindholm@arm.com>
a5bd9f6
Date: Wed, 28 Nov 2012 14:18:45 +0100
a5bd9f6
Subject: [PATCH 055/364]         * include/grub/types.h: Fix functionality
a5bd9f6
 unaffecting typo in         GRUB_TARGET_WORDSIZE conditional macro.
a5bd9f6
a5bd9f6
---
a5bd9f6
 ChangeLog            | 5 +++++
a5bd9f6
 include/grub/types.h | 2 +-
a5bd9f6
 2 files changed, 6 insertions(+), 1 deletion(-)
a5bd9f6
a5bd9f6
diff --git a/ChangeLog b/ChangeLog
a5bd9f6
index 1759da4..b26bfcb 100644
a5bd9f6
--- a/ChangeLog
a5bd9f6
+++ b/ChangeLog
a5bd9f6
@@ -1,3 +1,8 @@
a5bd9f6
+2012-11-28  Leif Lindholm  <leif.lindholm@arm.com>
a5bd9f6
+
a5bd9f6
+        * include/grub/types.h: Fix functionality unaffecting typo in
a5bd9f6
+        GRUB_TARGET_WORDSIZE conditional macro.
a5bd9f6
+
a5bd9f6
 2012-11-28  Paulo Flabiano Smorigo  <pfsmorigo@br.ibm.com>
a5bd9f6
 
a5bd9f6
 	* grub-core/net/bootp.c (parse_dhcp_vendor): Fix double increment.
a5bd9f6
diff --git a/include/grub/types.h b/include/grub/types.h
a5bd9f6
index 3e677c6..22d1be7 100644
a5bd9f6
--- a/include/grub/types.h
a5bd9f6
+++ b/include/grub/types.h
a5bd9f6
@@ -50,7 +50,7 @@
a5bd9f6
 # error "This architecture is not supported because sizeof(void *) != 4 and sizeof(void *) != 8"
a5bd9f6
 #endif
a5bd9f6
 
a5bd9f6
-#if !defined (GRUB_UTIL) & !defined (GRUB_TARGET_WORDSIZE)
a5bd9f6
+#if !defined (GRUB_UTIL) && !defined (GRUB_TARGET_WORDSIZE)
a5bd9f6
 # if GRUB_TARGET_SIZEOF_VOID_P == 4
a5bd9f6
 #  define GRUB_TARGET_WORDSIZE 32
a5bd9f6
 # elif GRUB_TARGET_SIZEOF_VOID_P == 8
a5bd9f6
-- 
a5bd9f6
1.8.1.4
a5bd9f6