Skip to contentSkip to conversation

Typo in types.h

PATCH In review Leif Lindholm 2 participants 3 messages Nov 26, 2012 – Nov 28, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Typo in types.h

& -> &&

Current version functionally correct, but reads a bit funny.

Regards,

Leif

=== modified file 'include/grub/types.h'

grub/types.h +1 -1
@@ -50,7 +50,7 @@
 # error "This architecture is not supported because sizeof(void *) != 4 and sizeof(void *) != 8"
 #endif
 
-#if !defined (GRUB_UTIL) & !defined (GRUB_TARGET_WORDSIZE)
+#if !defined (GRUB_UTIL) && !defined (GRUB_TARGET_WORDSIZE)
 # if GRUB_TARGET_SIZEOF_VOID_P == 4
 #  define GRUB_TARGET_WORDSIZE 32
 # elif GRUB_TARGET_SIZEOF_VOID_P == 8
#2 lore raw
Quoted 6 lines · Vladimir 'φ-coder/phcoder' Serbinenko
Quoted 3 lines · Leif Lindholm

& -> &&

Current version functionally correct, but reads a bit funny.

Please add a correct ChangeLog entry.

Complete patch attached.

/
Leif

=== modified file 'ChangeLog'

ChangeLog +5 -0
@@ -1,3 +1,8 @@
+2012-11-28  Leif Lindholm  <[email protected]>
+
+        * include/grub/types.h: Fix functionality unaffecting typo in 
+        GRUB_TARGET_WORDSIZE conditional macro.
+
 2012-10-28  Grégoire Sutre  <[email protected]>
 
 	* util/grub.d/10_netbsd.in: Fix tab indentation and make sure

=== modified file 'include/grub/types.h'

grub/types.h +1 -1
@@ -50,7 +50,7 @@
 # error "This architecture is not supported because sizeof(void *) != 4 and sizeof(void *) != 8"
 #endif
 
-#if !defined (GRUB_UTIL) & !defined (GRUB_TARGET_WORDSIZE)
+#if !defined (GRUB_UTIL) && !defined (GRUB_TARGET_WORDSIZE)
 # if GRUB_TARGET_SIZEOF_VOID_P == 4
 #  define GRUB_TARGET_WORDSIZE 32
 # elif GRUB_TARGET_SIZEOF_VOID_P == 8