From: Alex Rønne Petersen <alex@alexrp.com>
Date: Wed, 22 May 2013 04:49:03 +0000 (+0300)
Subject: Fix the check in bf9c7dcc5ec5fddb673d97079d5443b919785b33.
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=6df55cf92a314af75c2723ff9a1f3c4128c52dfd;p=mono.git

Fix the check in bf9c7dcc5ec5fddb673d97079d5443b919785b33.

The C preprocessor sucks.
---

diff --git a/mono/mini/mini-arm.c b/mono/mini/mini-arm.c
index ab739af4d63..572351d0e35 100644
--- a/mono/mini/mini-arm.c
+++ b/mono/mini/mini-arm.c
@@ -25,8 +25,8 @@
 #include "mono/arch/arm/arm-vfp-codegen.h"
 
 /* Sanity check: This makes no sense */
-#ifdef ARM_FPU_NONE && (ARM_FPU_VFP || ARM_FPU_VFP_HARD)
-#error "ARM_FPU_NONE and is defined while ARM_FPU_VFP/ARM_FPU_VFP_HARD is defined"
+#if defined(ARM_FPU_NONE) && (defined(ARM_FPU_VFP) || defined(ARM_FPU_VFP_HARD))
+#error "ARM_FPU_NONE is defined while one of ARM_FPU_VFP/ARM_FPU_VFP_HARD is defined"
 #endif
 
 #if defined(__ARM_EABI__) && defined(__linux__) && !defined(PLATFORM_ANDROID) && !defined(__native_client__)