diff options
| author | yangjie <[email protected]> | 2019-04-24 19:06:40 +0800 |
|---|---|---|
| committer | yangjie <[email protected]> | 2019-04-24 19:06:40 +0800 |
| commit | 02c7158c1a70869cc5e2d11dbfaae41b1979de85 (patch) | |
| tree | df707e33e46ea17f6b146f0a51f96925e7979538 /components | |
| parent | d91083988073ef98d2ea9bb8af0211cdc1559f36 (diff) | |
| parent | 14252b4e4072e913a030032790742f3c754983e3 (diff) | |
Merge branch 'master' of https://github.com/RT-Thread/rt-thread into yj_fix_branch
Diffstat (limited to 'components')
| -rw-r--r-- | components/dfs/Kconfig | 1 | ||||
| -rw-r--r-- | components/net/sal_socket/src/sal_socket.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/components/dfs/Kconfig b/components/dfs/Kconfig index 35c7cf1b02..c93fd02e66 100644 --- a/components/dfs/Kconfig +++ b/components/dfs/Kconfig @@ -113,6 +113,7 @@ if RT_USING_DFS config RT_USING_DFS_RAMFS bool "Enable RAM file system" + select RT_USING_MEMHEAP default n config RT_USING_DFS_UFFS diff --git a/components/net/sal_socket/src/sal_socket.c b/components/net/sal_socket/src/sal_socket.c index 581761103a..f4d5549aad 100644 --- a/components/net/sal_socket/src/sal_socket.c +++ b/components/net/sal_socket/src/sal_socket.c @@ -139,7 +139,7 @@ static void check_netdev_internet_up_work(struct rt_work *work, void *work_data) #define SAL_INTERNET_MONTH_LEN 4 #define SAL_INTERNET_DATE_LEN 16 - int index, sockfd = 0, result = 0; + int index, sockfd = -1, result = 0; struct sockaddr_in server_addr; struct hostent *host; struct timeval timeout; |