diff options
| author | 梁永祥 <[email protected]> | 2018-07-19 21:06:57 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-07-19 21:06:57 +0800 |
| commit | f489bfe522a1b307636ce2a47fed3b67b0567610 (patch) | |
| tree | ec480f651d02006df80ed7922bfb463ae6653db8 /include | |
| parent | 9868dffc2fb2585379913e8af5bbbda229b7255d (diff) | |
| parent | 50b633ed1e490ea92307ff16aaf0947ded007c18 (diff) | |
Merge branch 'master' into lwip-debug
Diffstat (limited to 'include')
| -rw-r--r-- | include/libc/libc_fdset.h | 2 | ||||
| -rw-r--r-- | include/rtdbg.h | 2 | ||||
| -rw-r--r-- | include/rtdebug.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/libc/libc_fdset.h b/include/libc/libc_fdset.h index 057cc7fed2..74c4ba1cb2 100644 --- a/include/libc/libc_fdset.h +++ b/include/libc/libc_fdset.h @@ -35,7 +35,7 @@ #else -#ifdef RT_USING_DFS_NET +#ifdef SAL_USING_POSIX #ifdef FD_SETSIZE #undef FD_SETSIZE diff --git a/include/rtdbg.h b/include/rtdbg.h index 84e4b97d3f..f53aba8de9 100644 --- a/include/rtdbg.h +++ b/include/rtdbg.h @@ -60,7 +60,7 @@ #define DBG_ERROR 3 #ifndef DBG_SECTION_NAME -#define DBG_SECTION_NAME "[ DBG]" +#define DBG_SECTION_NAME "DBG" #endif #ifdef DBG_ENABLE diff --git a/include/rtdebug.h b/include/rtdebug.h index 417ba70185..040d19e684 100644 --- a/include/rtdebug.h +++ b/include/rtdebug.h @@ -29,8 +29,8 @@ #error "POSIX poll/select, stdin need file system(RT_USING_DFS) and device file system(RT_USING_DFS_DEVFS)" #endif -#if defined(RT_USING_LWIP) && !defined(RT_USING_DFS_NET) -#error "POSIX poll/select, stdin need file BSD socket API(RT_USING_DFS_NET)" +#if defined(RT_USING_LWIP) && !defined(SAL_USING_POSIX) +#error "POSIX poll/select, stdin need file BSD socket API(SAL_USING_POSIX)" #endif #if !defined(RT_USING_LIBC) |