diff mbox

[Xen-devel,16/34] xen/arm: Guard correctly asm-arm/platforms/midway.h

Message ID 1395766541-23979-17-git-send-email-julien.grall@linaro.org
State Deferred, archived
Headers show

Commit Message

Julien Grall March 25, 2014, 4:55 p.m. UTC
Fix compilation with clang 3.5:
xen/include/asm/platforms/midway.h:1:9: error: '__ASM_ARM_PLATFORMS_MIDWAY_H' is used as a header guard here, followed by #define of a different macro [-Werror,-Wheader-guard]
                                                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
xen/include/asm/platforms/midway.h:2:9: note: '__ASM_ASM_PLATFORMS_MIDWAY_H' is defined here; did you mean '__ASM_ARM_PLATFORMS_MIDWAY_H'?
                                               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
        __ASM_ARM_PLATFORMS_MIDWAY_H

Signed-off-by: Julien Grall <julien.grall@linaro.org>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@citrix.com>
Cc: Tim Deegan <tim@xen.org>
---
 xen/include/asm-arm/platforms/midway.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Ian Campbell March 27, 2014, 4:43 p.m. UTC | #1
On Tue, 2014-03-25 at 16:55 +0000, Julien Grall wrote:
> Fix compilation with clang 3.5:
> xen/include/asm/platforms/midway.h:1:9: error: '__ASM_ARM_PLATFORMS_MIDWAY_H' is used as a header guard here, followed by #define of a different macro [-Werror,-Wheader-guard]
>                                                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
> xen/include/asm/platforms/midway.h:2:9: note: '__ASM_ASM_PLATFORMS_MIDWAY_H' is defined here; did you mean '__ASM_ARM_PLATFORMS_MIDWAY_H'?
>                                                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
>         __ASM_ARM_PLATFORMS_MIDWAY_H
> 
> Signed-off-by: Julien Grall <julien.grall@linaro.org>

Acked-by: Ian Campbell <ian.campbell@citrix.com>
diff mbox

Patch

diff --git a/xen/include/asm-arm/platforms/midway.h b/xen/include/asm-arm/platforms/midway.h
index 099e435..6914393 100644
--- a/xen/include/asm-arm/platforms/midway.h
+++ b/xen/include/asm-arm/platforms/midway.h
@@ -1,5 +1,5 @@ 
 #ifndef __ASM_ARM_PLATFORMS_MIDWAY_H
-#define __ASM_ASM_PLATFORMS_MIDWAY_H
+#define __ASM_ARM_PLATFORMS_MIDWAY_H
 
 /* addresses of SREG registers for resetting the SoC */
 #define MW_SREG_PWR_REQ             0xfff3cf00