From 368e4fc1662c2594b2a0908900713a2555a3ed8e Mon Sep 17 00:00:00 2001
From: Michael Hope <michael.hope@linaro.org>
Date: Wed, 29 Sep 2010 20:42:18 +1300
Subject: Fixed up the build due to a missing header file.

---
 libmaple/nvic.h | 8 ++++----
 wirish/time.h   | 9 +++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/libmaple/nvic.h b/libmaple/nvic.h
index 4f4972d..9e81a0e 100644
--- a/libmaple/nvic.h
+++ b/libmaple/nvic.h
@@ -29,6 +29,10 @@
 #ifndef _NVIC_H_
 #define _NVIC_H_
 
+#ifdef __cplusplus
+extern "C"{
+#endif
+
 #define NVIC_INT_USBHP      19
 #define NVIC_INT_USBLP      20
 #define NVIC_EXTI1_OFFSET   (NVIC_ISER0 + 0x07)
@@ -52,10 +56,6 @@
 #define NVIC_VectTab_RAM             ((u32)0x20000000)
 #define NVIC_VectTab_FLASH           ((u32)0x08000000)
 
-#ifdef __cplusplus
-extern "C"{
-#endif
-
 enum {
    NVIC_TIMER1  = 27,
    NVIC_TIMER2  = 28,
diff --git a/wirish/time.h b/wirish/time.h
index ad39057..f4612fa 100644
--- a/wirish/time.h
+++ b/wirish/time.h
@@ -29,14 +29,15 @@
 #ifndef _TIME_H
 #define _TIME_H
 
-#ifdef __cplusplus
-extern "C"{
-#endif
-
+#include "libmaple.h"
 #include "nvic.h"
 #include "systick.h"
 #include "boards.h"
 
+#ifdef __cplusplus
+extern "C"{
+#endif
+
 #define US_PER_MS               1000
 
 extern volatile uint32 systick_timer_millis;
-- 
cgit v1.2.3