diff --git a/bsp/simulator/rtconfig.h b/bsp/simulator/rtconfig.h index 5e0f9ead12fa8d3a5d26f75de135a426d90f36e3..c01930fe59888d0baa4856e6103d2c241d393205 100755 --- a/bsp/simulator/rtconfig.h +++ b/bsp/simulator/rtconfig.h @@ -10,6 +10,8 @@ #undef RT_USING_MINILIBC #define NORESOURCE //RT_VESRION in winuser.h #define _CRT_ERRNO_DEFINED //errno macro redefinition +#define _INC_WTIME_INL//dfs_elm.c time.h conflicts with wtime.inl +#define _INC_TIME_INL //dfs_elm.c time.h conflicts with wtime.inl /* disable some warning in MSC */ #pragma warning(disable:4273) /* to ignore: warning C4273: inconsistent dll linkage */ diff --git a/components/dfs/filesystems/elmfat/dfs_elm.c b/components/dfs/filesystems/elmfat/dfs_elm.c index 4a69b6a64f4be801f1b55d3ebaad3f311b73e922..4f24a0cd72faf8564fb988b3b98e2c85c4a1ada9 100644 --- a/components/dfs/filesystems/elmfat/dfs_elm.c +++ b/components/dfs/filesystems/elmfat/dfs_elm.c @@ -17,12 +17,11 @@ * 2013-03-01 aozima fixed the stat(st_mtime) issue. */ -#include -#include - #include #include "ffconf.h" #include "ff.h" +#include +#include /* ELM FatFs provide a DIR struct */ #define HAVE_DIR_STRUCTURE