diff options
| author | Bernard Xiong <[email protected]> | 2013-03-04 06:59:05 -0800 |
|---|---|---|
| committer | Bernard Xiong <[email protected]> | 2013-03-04 06:59:05 -0800 |
| commit | 784e8e2459339001c48698f2dd0833c906da2b25 (patch) | |
| tree | 5827a30c8d3a24ef946187132642e5e961dc3078 /libcpu | |
| parent | c5d5a54c5d4807e336bce809e9f5097072525d3c (diff) | |
| parent | c6ba8eac62793868effcfb8ef888882dca2a3be3 (diff) | |
Merge branch 'master' of https://github.com/RT-Thread/rt-thread
Diffstat (limited to 'libcpu')
| -rw-r--r-- | libcpu/SConscript | 3 | ||||
| -rw-r--r-- | libcpu/sim/win32/cpu_port.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/libcpu/SConscript b/libcpu/SConscript index a1609d5fd3..0d00976092 100644 --- a/libcpu/SConscript +++ b/libcpu/SConscript @@ -18,6 +18,9 @@ if rtconfig.PLATFORM == 'iar': if rtconfig.PLATFORM == 'cl': src = Glob(path + '/*.c') +if rtconfig.PLATFORM == 'mingw': + src = Glob(path + '/*.c') + CPPPATH = [RTT_ROOT + '/libcpu/' + rtconfig.ARCH + '/' + rtconfig.CPU, RTT_ROOT + '/libcpu/' + rtconfig.ARCH + '/common'] group = DefineGroup(rtconfig.CPU.upper(), src, depend = [''], CPPPATH = CPPPATH) diff --git a/libcpu/sim/win32/cpu_port.c b/libcpu/sim/win32/cpu_port.c index 38c387b196..6bf3c79cf7 100644 --- a/libcpu/sim/win32/cpu_port.c +++ b/libcpu/sim/win32/cpu_port.c @@ -111,6 +111,7 @@ static DWORD WINAPI ThreadforKeyGet(LPVOID lpParam); static void SetThreadName(DWORD dwThreadID, char* threadName) { +#if defined(_MSC_VER) THREADNAME_INFO info; info.dwType = 0x1000; info.szName = threadName; @@ -124,6 +125,7 @@ static void SetThreadName(DWORD dwThreadID, char* threadName) __except(EXCEPTION_EXECUTE_HANDLER) { } +#endif } /* |