From 01ea8eb54f1838122ce4c938beb7b4452e89c2fe Mon Sep 17 00:00:00 2001
From: px4dev <px4@purgatory.org>
Date: Tue, 8 Jan 2013 08:26:04 -0800
Subject: Test for CortexM4 and FPU rather than the ARM mathlib-internal
 define.

---
 apps/mathlib/math/Matrix.hpp | 4 +++-
 apps/mathlib/math/Vector.hpp | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'apps/mathlib')

diff --git a/apps/mathlib/math/Matrix.hpp b/apps/mathlib/math/Matrix.hpp
index 4d7731653..f19db15ec 100644
--- a/apps/mathlib/math/Matrix.hpp
+++ b/apps/mathlib/math/Matrix.hpp
@@ -39,7 +39,9 @@
 
 #pragma once
 
-#ifdef ARM_MATH_CM4
+#include <nuttx/config.h>
+
+#if defined(CONFIG_ARCH_CORTEXM4) && defined(CONFIG_ARCH_FPU)
 #include "arm/Matrix.hpp"
 #else
 #include "generic/Matrix.hpp"
diff --git a/apps/mathlib/math/Vector.hpp b/apps/mathlib/math/Vector.hpp
index 773bd5032..73de793d5 100644
--- a/apps/mathlib/math/Vector.hpp
+++ b/apps/mathlib/math/Vector.hpp
@@ -39,7 +39,9 @@
 
 #pragma once
 
-#ifdef ARM_MATH_CM4
+#include <nuttx/config.h>
+
+#if defined(CONFIG_ARCH_CORTEXM4) && defined(CONFIG_ARCH_FPU)
 #include "arm/Vector.hpp"
 #else
 #include "generic/Vector.hpp"
-- 
cgit v1.2.3