commit c8353295e8ab7cf2f3b8a6b70794e18c6d05afe1
author Jonatan Antoni <jonatan.antoni@arm.com> Thu Oct 19 15:29:56 2017 +0200
committer Jonatan Antoni <jonatan.antoni@arm.com> Fri Oct 27 09:38:04 2017 +0200
tree bcb0eb3e4e3bedd9171983c21053617aa6cfd145
parent d05a7dc7e9fcf0e013b4494cde905ae5f8065a59

Core: Added #error condition to cmsis_iccarm.h if intrinsics.h is included earlier.
intrinsics.h must not included manually before cmsis_iccarm.h because CMSIS redefines some intrinsic function.

CMSIS/Core/Include/cmsis_iccarm.h

diff --git a/CMSIS/Core/Include/cmsis_iccarm.h b/CMSIS/Core/Include/cmsis_iccarm.h
index f848905..875e147 100644
--- a/CMSIS/Core/Include/cmsis_iccarm.h
+++ b/CMSIS/Core/Include/cmsis_iccarm.h
@@ -436,6 +436,10 @@
     #define __set_FPSCR __cmsis_iar_set_FPSR_not_active
   #endif
 
+  #ifdef __INTRINSICS_INCLUDED
+  #error intrinsics.h is already included previously!
+  #endif
+  
   #include <intrinsics.h>
 
   #if __IAR_M0_FAMILY

CMSIS/Core_A/Include/cmsis_iccarm.h

diff --git a/CMSIS/Core_A/Include/cmsis_iccarm.h b/CMSIS/Core_A/Include/cmsis_iccarm.h
index f85b324..1b34bb8 100644
--- a/CMSIS/Core_A/Include/cmsis_iccarm.h
+++ b/CMSIS/Core_A/Include/cmsis_iccarm.h
@@ -362,6 +362,10 @@
   #define __get_FPSCR __cmsis_iar_get_FPSR_not_active
   #endif
 
+  #ifdef __INTRINSICS_INCLUDED
+  #error intrinsics.h is already included previously!
+  #endif
+  
   #include <intrinsics.h>
 
   #if !__FPU_PRESENT