Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Xiaobo07
rt-thread
提交
c147ff41
R
rt-thread
项目概览
Xiaobo07
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
2
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
c147ff41
编写于
5月 18, 2022
作者:
mysterywolf
提交者:
GitHub
5月 19, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[rtdef][libc] solve the conflicts between libc data types and rtdef data types (#5961)
上级
50a42331
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
18 addition
and
3 deletion
+18
-3
components/libc/compilers/armlibc/SConscript
components/libc/compilers/armlibc/SConscript
+1
-1
components/libc/compilers/dlib/SConscript
components/libc/compilers/dlib/SConscript
+1
-1
components/libc/compilers/newlib/SConscript
components/libc/compilers/newlib/SConscript
+1
-1
include/rtdef.h
include/rtdef.h
+15
-0
未找到文件。
components/libc/compilers/armlibc/SConscript
浏览文件 @
c147ff41
...
@@ -4,7 +4,7 @@ Import('rtconfig')
...
@@ -4,7 +4,7 @@ Import('rtconfig')
src
=
Glob
(
'*.c'
)
src
=
Glob
(
'*.c'
)
group
=
[]
group
=
[]
CPPDEFINES
=
[
'RT_USING_ARM_LIBC'
]
CPPDEFINES
=
[
'RT_USING_ARM_LIBC'
,
'RT_USING_LIBC'
]
if
rtconfig
.
PLATFORM
in
[
'armcc'
,
'armclang'
]:
if
rtconfig
.
PLATFORM
in
[
'armcc'
,
'armclang'
]:
group
=
DefineGroup
(
'Compiler'
,
src
,
depend
=
[
''
],
CPPDEFINES
=
CPPDEFINES
)
group
=
DefineGroup
(
'Compiler'
,
src
,
depend
=
[
''
],
CPPDEFINES
=
CPPDEFINES
)
...
...
components/libc/compilers/dlib/SConscript
浏览文件 @
c147ff41
...
@@ -4,7 +4,7 @@ Import('rtconfig')
...
@@ -4,7 +4,7 @@ Import('rtconfig')
src
=
Glob
(
'*.c'
)
src
=
Glob
(
'*.c'
)
group
=
[]
group
=
[]
CPPDEFINES
=
[
'RT_USING_DLIBC'
]
CPPDEFINES
=
[
'RT_USING_DLIBC'
,
'RT_USING_LIBC'
]
if
rtconfig
.
PLATFORM
==
'iar'
:
if
rtconfig
.
PLATFORM
==
'iar'
:
if
GetDepend
(
'DFS_USING_POSIX'
):
if
GetDepend
(
'DFS_USING_POSIX'
):
...
...
components/libc/compilers/newlib/SConscript
浏览文件 @
c147ff41
...
@@ -17,7 +17,7 @@ if rtconfig.PLATFORM == 'gcc':
...
@@ -17,7 +17,7 @@ if rtconfig.PLATFORM == 'gcc':
print
(
'Newlib version:'
+
GetNewLibVersion
(
rtconfig
))
print
(
'Newlib version:'
+
GetNewLibVersion
(
rtconfig
))
# identify this is Newlib, and only enable POSIX.1-1990
# identify this is Newlib, and only enable POSIX.1-1990
CPPDEFINES
=
[
'RT_USING_NEWLIB'
,
'_POSIX_C_SOURCE=1'
]
CPPDEFINES
=
[
'RT_USING_NEWLIB'
,
'
RT_USING_LIBC'
,
'
_POSIX_C_SOURCE=1'
]
group
=
DefineGroup
(
'Compiler'
,
src
,
depend
=
[
''
],
CPPPATH
=
CPPPATH
,
CPPDEFINES
=
CPPDEFINES
,
LIBS
=
LIBS
)
group
=
DefineGroup
(
'Compiler'
,
src
,
depend
=
[
''
],
CPPPATH
=
CPPPATH
,
CPPDEFINES
=
CPPDEFINES
,
LIBS
=
LIBS
)
...
...
include/rtdef.h
浏览文件 @
c147ff41
...
@@ -71,6 +71,20 @@ extern "C" {
...
@@ -71,6 +71,20 @@ extern "C" {
/* RT-Thread basic data type definitions */
/* RT-Thread basic data type definitions */
#ifndef RT_USING_ARCH_DATA_TYPE
#ifndef RT_USING_ARCH_DATA_TYPE
#ifdef RT_USING_LIBC
#include <stdint.h>
#include <stddef.h>
typedef
int8_t
rt_int8_t
;
/**< 8bit integer type */
typedef
int16_t
rt_int16_t
;
/**< 16bit integer type */
typedef
int32_t
rt_int32_t
;
/**< 32bit integer type */
typedef
uint8_t
rt_uint8_t
;
/**< 8bit unsigned integer type */
typedef
uint16_t
rt_uint16_t
;
/**< 16bit unsigned integer type */
typedef
uint32_t
rt_uint32_t
;
/**< 32bit unsigned integer type */
typedef
int64_t
rt_int64_t
;
/**< 64bit integer type */
typedef
uint64_t
rt_uint64_t
;
/**< 64bit unsigned integer type */
typedef
size_t
rt_size_t
;
/**< Type for size number */
#else
typedef
signed
char
rt_int8_t
;
/**< 8bit integer type */
typedef
signed
char
rt_int8_t
;
/**< 8bit integer type */
typedef
signed
short
rt_int16_t
;
/**< 16bit integer type */
typedef
signed
short
rt_int16_t
;
/**< 16bit integer type */
typedef
signed
int
rt_int32_t
;
/**< 32bit integer type */
typedef
signed
int
rt_int32_t
;
/**< 32bit integer type */
...
@@ -87,6 +101,7 @@ typedef signed long long rt_int64_t; /**< 64bit integer type
...
@@ -87,6 +101,7 @@ typedef signed long long rt_int64_t; /**< 64bit integer type
typedef
unsigned
long
long
rt_uint64_t
;
/**< 64bit unsigned integer type */
typedef
unsigned
long
long
rt_uint64_t
;
/**< 64bit unsigned integer type */
typedef
unsigned
int
rt_size_t
;
/**< Type for size number */
typedef
unsigned
int
rt_size_t
;
/**< Type for size number */
#endif
/* ARCH_CPU_64BIT */
#endif
/* ARCH_CPU_64BIT */
#endif
/* RT_USING_LIBC */
#endif
/* RT_USING_ARCH_DATA_TYPE */
#endif
/* RT_USING_ARCH_DATA_TYPE */
typedef
int
rt_bool_t
;
/**< boolean type */
typedef
int
rt_bool_t
;
/**< boolean type */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录