libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

change version number 

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@622 bbd45198-f89e-11dd-88c7-29a3b14d5316
This commit is contained in:
bernard.xiong 2010-04-15 01:41:10 +00:00
parent 23ea4f1b74
commit 5195a7fb79
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/rtdef.h
View File

@ -22,8 +22,8 @@ extern "C" {
#endif #endif
/* RT-Thread version information */ /* RT-Thread version information */
#define RT_VERSION 3 #define RT_VERSION 4L
#define RT_SUBVERSION 0 #define RT_SUBVERSION 0L
/* date type defination */ /* date type defination */
typedef signed char rt_int8_t; typedef signed char rt_int8_t;
@ -56,12 +56,19 @@ typedef rt_uint32_t rt_off_t; /* Type for offset. */
#define RT_UINT16_MAX 0xffff /* Maxium number of UINT16. */ #define RT_UINT16_MAX 0xffff /* Maxium number of UINT16. */
#define RT_UINT32_MAX 0xffffffff /* Maxium number of UINT32. */ #define RT_UINT32_MAX 0xffffffff /* Maxium number of UINT32. */
/* Compiler Related Definitions */
#ifdef __CC_ARM /* ARM Compiler */ #ifdef __CC_ARM /* ARM Compiler */
#include <stdarg.h> #include <stdarg.h>
#define SECTION(x) __attribute__((section(x))) #define SECTION(x) __attribute__((section(x)))
#define UNUSED __attribute__((unused)) #define UNUSED __attribute__((unused))
#define ALIGN(n) __attribute__((aligned(n))) #define ALIGN(n) __attribute__((aligned(n)))
#define rt_inline static __inline #define rt_inline static __inline
/* module compiling */
#ifdef RT_USING_MODULE
#define RTT_API __declspec(dllimport)
#else
#define RTT_API __declspec(dllexport)
#endif
#elif defined (__ICCARM__) /* for IAR Compiler */ #elif defined (__ICCARM__) /* for IAR Compiler */
#include <stdarg.h> #include <stdarg.h>
@ -69,6 +76,7 @@ typedef rt_uint32_t rt_off_t; /* Type for offset. */
#define UNUSED #define UNUSED
#define ALIGN(n) #pragma pack(n) #define ALIGN(n) #pragma pack(n)
#define rt_inline inline #define rt_inline inline
#define RTT_API
#elif defined (__GNUC__) /* GNU GCC Compiler */ #elif defined (__GNUC__) /* GNU GCC Compiler */
#ifdef RT_USING_NEWLIB #ifdef RT_USING_NEWLIB
@ -91,11 +99,15 @@ typedef rt_uint32_t rt_off_t; /* Type for offset. */
#define UNUSED __attribute__((unused)) #define UNUSED __attribute__((unused))
#define ALIGN(n) __attribute__((aligned(n))) #define ALIGN(n) __attribute__((aligned(n)))
#define rt_inline static __inline #define rt_inline static __inline
#define RTT_API
#elif defined (__ICCM16C__) /* for IAR EW M16C Compiler */ #elif defined (__ICCM16C__) /* for IAR EW M16C Compiler */
#include <stdarg.h> #include <stdarg.h>
#define SECTION(x) @ x #define SECTION(x) @ x
#define UNUSED #define UNUSED
#define rt_inline inline #define rt_inline inline
#define RTT_API
#endif #endif
/* event length */ /* event length */

10
include/rtthread.h
View File

@ -27,16 +27,6 @@
extern "C" { extern "C" {
#endif #endif
#if defined(__CC_ARM)
#ifdef RT_USING_MODULE
#define RTT_API __declspec(dllimport)
#else
#define RTT_API __declspec(dllexport)
#endif
#elif defined(__GNUC__)
#define RTT_API
#endif
/** /**
* @addtogroup KernelObject * @addtogroup KernelObject
*/ */

4
src/kservice.c
View File

@ -922,13 +922,13 @@ rt_device_t rt_console_set_device(const char* name)
#if defined(__GNUC__) #if defined(__GNUC__)
void rt_hw_console_output(const char* str) __attribute__((weak)); void rt_hw_console_output(const char* str) __attribute__((weak));
void rt_hw_console_output(const char* str) void rt_hw_console_output(const char* str)
#elif defined(__CC_ARM) #elif defined(__CC_ARM)
__weak void rt_hw_console_output(const char* str) __weak void rt_hw_console_output(const char* str)
#elif defined(__ICCARM__) #elif defined(__ICCARM__)
__weak void rt_hw_console_output(const char* str) __weak void rt_hw_console_output(const char* str)
#elif defined(__ICCM16C__)
__weak void rt_hw_console_output(const char* str)
#endif #endif
{ {
/* empty console output */ /* empty console output */