From d76d30cf509e1945af652bf7921bba4d11e605e9 Mon Sep 17 00:00:00 2001 From: liruncong Date: Sat, 14 Sep 2019 22:52:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[components/libc/compilers]c++=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=BC=95=E7=94=A8libc.h=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/libc/compilers/armlibc/libc.h | 16 +++++++++++----- components/libc/compilers/dlib/libc.h | 16 +++++++++++----- components/libc/compilers/newlib/libc.h | 20 +++++++++++++------- 3 files changed, 35 insertions(+), 17 deletions(-) diff --git a/components/libc/compilers/armlibc/libc.h b/components/libc/compilers/armlibc/libc.h index 158fe06c3e..38d72241d5 100644 --- a/components/libc/compilers/armlibc/libc.h +++ b/components/libc/compilers/armlibc/libc.h @@ -12,11 +12,17 @@ #include -int libc_system_init(void); +#ifdef __cplusplus +extern "C" { +#endif + int libc_system_init(void); -int libc_stdio_set_console(const char* device_name, int mode); -int libc_stdio_get_console(void); -int libc_stdio_read (void *buffer, size_t size); -int libc_stdio_write(const void *buffer, size_t size); + int libc_stdio_set_console(const char* device_name, int mode); + int libc_stdio_get_console(void); + int libc_stdio_read(void* buffer, size_t size); + int libc_stdio_write(const void* buffer, size_t size); +#ifdef __cplusplus +} +#endif #endif diff --git a/components/libc/compilers/dlib/libc.h b/components/libc/compilers/dlib/libc.h index 7b2665c32b..a3a5753c77 100644 --- a/components/libc/compilers/dlib/libc.h +++ b/components/libc/compilers/dlib/libc.h @@ -13,11 +13,17 @@ #include -int libc_system_init(void); +#ifdef __cplusplus +extern "C" { +#endif + int libc_system_init(void); -int libc_stdio_set_console(const char* device_name, int mode); -int libc_stdio_get_console(void); -int libc_stdio_read (void *buffer, size_t size); -int libc_stdio_write(const void *buffer, size_t size); + int libc_stdio_set_console(const char* device_name, int mode); + int libc_stdio_get_console(void); + int libc_stdio_read(void* buffer, size_t size); + int libc_stdio_write(const void* buffer, size_t size); +#ifdef __cplusplus +} +#endif #endif diff --git a/components/libc/compilers/newlib/libc.h b/components/libc/compilers/newlib/libc.h index ab9334fe26..e2613740b9 100644 --- a/components/libc/compilers/newlib/libc.h +++ b/components/libc/compilers/newlib/libc.h @@ -27,13 +27,19 @@ #define MICROSECOND_PER_TICK (MICROSECOND_PER_SECOND / RT_TICK_PER_SECOND) #define NANOSECOND_PER_TICK (NANOSECOND_PER_SECOND / RT_TICK_PER_SECOND) -int libc_system_init(void); -int libc_stdio_set_console(const char* device_name, int mode); -int libc_stdio_get_console(void); +#ifdef __cplusplus +extern "C" { +#endif + int libc_system_init(void); + int libc_stdio_set_console(const char* device_name, int mode); + int libc_stdio_get_console(void); -/* some time related function */ -int libc_set_time(const struct timespec *time); -int libc_get_time(struct timespec *time); -int libc_time_to_tick(const struct timespec *time); + /* some time related function */ + int libc_set_time(const struct timespec* time); + int libc_get_time(struct timespec* time); + int libc_time_to_tick(const struct timespec* time); +#ifdef __cplusplus +} +#endif #endif From 408bb22af68264182aea70be9a7db9140dc438a1 Mon Sep 17 00:00:00 2001 From: liruncong Date: Sun, 15 Sep 2019 11:47:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[components/libc/compilers]=E6=92=A4?= =?UTF-8?q?=E9=94=80=E7=94=B1VS=E7=BC=96=E8=BE=91=E5=99=A8=E5=9C=A8?= =?UTF-8?q?=E9=94=AE=E5=85=A5}=E5=90=8E=E8=87=AA=E5=8A=A8=E5=BC=95?= =?UTF-8?q?=E8=B5=B7=E7=9A=84=E7=BC=A9=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/libc/compilers/armlibc/libc.h | 10 +++++----- components/libc/compilers/dlib/libc.h | 10 +++++----- components/libc/compilers/newlib/libc.h | 14 +++++++------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/components/libc/compilers/armlibc/libc.h b/components/libc/compilers/armlibc/libc.h index 38d72241d5..b9b1b6212d 100644 --- a/components/libc/compilers/armlibc/libc.h +++ b/components/libc/compilers/armlibc/libc.h @@ -15,12 +15,12 @@ #ifdef __cplusplus extern "C" { #endif - int libc_system_init(void); +int libc_system_init(void); - int libc_stdio_set_console(const char* device_name, int mode); - int libc_stdio_get_console(void); - int libc_stdio_read(void* buffer, size_t size); - int libc_stdio_write(const void* buffer, size_t size); +int libc_stdio_set_console(const char* device_name, int mode); +int libc_stdio_get_console(void); +int libc_stdio_read(void* buffer, size_t size); +int libc_stdio_write(const void* buffer, size_t size); #ifdef __cplusplus } #endif diff --git a/components/libc/compilers/dlib/libc.h b/components/libc/compilers/dlib/libc.h index a3a5753c77..5b46bee0c8 100644 --- a/components/libc/compilers/dlib/libc.h +++ b/components/libc/compilers/dlib/libc.h @@ -16,12 +16,12 @@ #ifdef __cplusplus extern "C" { #endif - int libc_system_init(void); +int libc_system_init(void); - int libc_stdio_set_console(const char* device_name, int mode); - int libc_stdio_get_console(void); - int libc_stdio_read(void* buffer, size_t size); - int libc_stdio_write(const void* buffer, size_t size); +int libc_stdio_set_console(const char* device_name, int mode); +int libc_stdio_get_console(void); +int libc_stdio_read(void* buffer, size_t size); +int libc_stdio_write(const void* buffer, size_t size); #ifdef __cplusplus } #endif diff --git a/components/libc/compilers/newlib/libc.h b/components/libc/compilers/newlib/libc.h index e2613740b9..fdf2ab4f60 100644 --- a/components/libc/compilers/newlib/libc.h +++ b/components/libc/compilers/newlib/libc.h @@ -30,14 +30,14 @@ #ifdef __cplusplus extern "C" { #endif - int libc_system_init(void); - int libc_stdio_set_console(const char* device_name, int mode); - int libc_stdio_get_console(void); +int libc_system_init(void); +int libc_stdio_set_console(const char* device_name, int mode); +int libc_stdio_get_console(void); - /* some time related function */ - int libc_set_time(const struct timespec* time); - int libc_get_time(struct timespec* time); - int libc_time_to_tick(const struct timespec* time); +/* some time related function */ +int libc_set_time(const struct timespec* time); +int libc_get_time(struct timespec* time); +int libc_time_to_tick(const struct timespec* time); #ifdef __cplusplus } #endif