From c258ca794d6aeb84d35099781e066cf8b60ebb6a Mon Sep 17 00:00:00 2001 From: MurphyZhao Date: Wed, 10 Jan 2018 10:54:45 +0800 Subject: Fix-IAR-Version-Problem [dlib/sys/time.h] Fix iar version problem [bsp/stm32f429-apollo/applications/SConscript] Remove CPPDEFINES --- bsp/stm32f429-apollo/applications/SConscript | 8 +------- components/libc/compilers/dlib/sys/time.h | 4 ++++ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/bsp/stm32f429-apollo/applications/SConscript b/bsp/stm32f429-apollo/applications/SConscript index c9f4e204a4..52ec60a5c6 100644 --- a/bsp/stm32f429-apollo/applications/SConscript +++ b/bsp/stm32f429-apollo/applications/SConscript @@ -8,16 +8,10 @@ application.c startup.c """) -# add for startup script -if rtconfig.CROSS_TOOL == 'iar': - CPPDEFINES = ['_TIMESPEC_DEFINED'] -else: - CPPDEFINES = [] - # add UI engine demo. if GetDepend('RT_USING_GUIENGINE'): src += ['rtgui_demo.c'] -group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES=CPPDEFINES) +group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/components/libc/compilers/dlib/sys/time.h b/components/libc/compilers/dlib/sys/time.h index 2d60b37317..ac52745064 100644 --- a/components/libc/compilers/dlib/sys/time.h +++ b/components/libc/compilers/dlib/sys/time.h @@ -20,6 +20,10 @@ struct timeval { }; #endif /* _TIMEVAL_DEFINED */ +#if defined ( __ICCARM__ ) && (__VER__ >= 8011002) +#define _TIMESPEC_DEFINED +#endif + #ifndef _TIMESPEC_DEFINED #define _TIMESPEC_DEFINED /* -- cgit v1.3.1