提交 b17ca1fa 编写于 作者: B Bernard Xiong

Merge pull request #178 from prife/jffs2

simulator/jffs2: remove _TIME_T_DEFINED when built by VC++
...@@ -45,7 +45,6 @@ if rtconfig.PLATFORM == 'cl': ...@@ -45,7 +45,6 @@ if rtconfig.PLATFORM == 'cl':
_DEBUG _DEBUG
_CONSOLE _CONSOLE
MSVC MSVC
_TIME_T_DEFINED
''') ''')
env.Append(CCFLAGS=rtconfig.CFLAGS) env.Append(CCFLAGS=rtconfig.CFLAGS)
env.Append(LINKFLAGS=rtconfig.LFLAGS) env.Append(LINKFLAGS=rtconfig.LFLAGS)
......
...@@ -317,10 +317,11 @@ typedef void *cyg_io_handle_t; ...@@ -317,10 +317,11 @@ typedef void *cyg_io_handle_t;
#define S_ISGID (1<<26) #define S_ISGID (1<<26)
#if defined(MSVC) #if defined(MSVC)
/* for time_t */
#include <time.h>
typedef unsigned long mode_t; typedef unsigned long mode_t;
typedef unsigned int ino_t; typedef unsigned int ino_t;
typedef unsigned int dev_t; typedef unsigned int dev_t;
typedef int time_t;
typedef long ssize_t; typedef long ssize_t;
#elif defined(__CC_ARM) #elif defined(__CC_ARM)
#define mode_t unsigned long #define mode_t unsigned long
......
...@@ -78,7 +78,11 @@ typedef unsigned short gid_t; ...@@ -78,7 +78,11 @@ typedef unsigned short gid_t;
typedef unsigned short uid_t; typedef unsigned short uid_t;
typedef int pid_t; typedef int pid_t;
#if defined(MSVC)
#include <time.h>
#else
typedef int time_t; typedef int time_t;
#endif
//#include "os_sys_stat.h" //#include "os_sys_stat.h"
#endif /* CYGONCE_ISO_SYS_TYPES_H multiple inclusion protection */ #endif /* CYGONCE_ISO_SYS_TYPES_H multiple inclusion protection */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册