diff options
| author | Meco Man <[email protected]> | 2022-05-15 21:05:50 -0400 |
|---|---|---|
| committer | guo <[email protected]> | 2022-05-16 10:02:22 +0800 |
| commit | 2575a935161e6babee21aa0326c2771d2063e56f (patch) | |
| tree | c049f490de16a7eaa0cb505cc7ab48f13d2ac538 /components | |
| parent | 0e5bb9d042d74dd2997228f20f8bbcd5b56246da (diff) | |
rename sal.h as sal_low_lvl.h
Diffstat (limited to 'components')
| -rw-r--r-- | components/net/netdev/src/netdev.c | 2 | ||||
| -rw-r--r-- | components/net/sal/impl/af_inet_at.c | 2 | ||||
| -rw-r--r-- | components/net/sal/impl/af_inet_lwip.c | 2 | ||||
| -rw-r--r-- | components/net/sal/impl/proto_mbedtls.c | 2 | ||||
| -rw-r--r-- | components/net/sal/include/sal_low_lvl.h (renamed from components/net/sal/include/sal.h) | 6 | ||||
| -rw-r--r-- | components/net/sal/src/sal_socket.c | 2 |
6 files changed, 9 insertions, 7 deletions
diff --git a/components/net/netdev/src/netdev.c b/components/net/netdev/src/netdev.c index f121f52c19..2a87e91cb0 100644 --- a/components/net/netdev/src/netdev.c +++ b/components/net/netdev/src/netdev.c @@ -20,7 +20,7 @@ #ifdef RT_USING_SAL #include <sal_netdb.h> -#include <sal.h> +#include <sal_low_lvl.h> #endif /* RT_USING_SAL */ #define DBG_TAG "netdev" diff --git a/components/net/sal/impl/af_inet_at.c b/components/net/sal/impl/af_inet_at.c index 07dff0018c..e5cc8720f6 100644 --- a/components/net/sal/impl/af_inet_at.c +++ b/components/net/sal/impl/af_inet_at.c @@ -11,7 +11,7 @@ #include <rtthread.h> #include <netdb.h> -#include <sal.h> +#include <sal_low_lvl.h> #include <at_socket.h> #include <af_inet.h> diff --git a/components/net/sal/impl/af_inet_lwip.c b/components/net/sal/impl/af_inet_lwip.c index 2cf0958ee4..e99da3117a 100644 --- a/components/net/sal/impl/af_inet_lwip.c +++ b/components/net/sal/impl/af_inet_lwip.c @@ -20,7 +20,7 @@ #include <poll.h> #endif -#include <sal.h> +#include <sal_low_lvl.h> #include <af_inet.h> #include <netdev.h> diff --git a/components/net/sal/impl/proto_mbedtls.c b/components/net/sal/impl/proto_mbedtls.c index 338792c948..4ae9f26328 100644 --- a/components/net/sal/impl/proto_mbedtls.c +++ b/components/net/sal/impl/proto_mbedtls.c @@ -20,7 +20,7 @@ #include <sal_tls.h> #endif #include <netdb.h> -#include <sal.h> +#include <sal_low_lvl.h> #include <netdev.h> diff --git a/components/net/sal/include/sal.h b/components/net/sal/include/sal_low_lvl.h index dd250e37b6..95f984cca8 100644 --- a/components/net/sal/include/sal.h +++ b/components/net/sal/include/sal_low_lvl.h @@ -6,10 +6,12 @@ * Change Logs: * Date Author Notes * 2018-05-17 ChenYong First version + * 2022-05-15 Meco Man rename sal.h as sal_low_lvl.h to avoid conflicts + * with Microsoft Visual Studio header file */ -#ifndef SAL_H__ -#define SAL_H__ +#ifndef SAL_LOW_LEVEL_H__ +#define SAL_LOW_LEVEL_H__ #include <rtdevice.h> diff --git a/components/net/sal/src/sal_socket.c b/components/net/sal/src/sal_socket.c index 8f4ac915eb..2ed8e69e79 100644 --- a/components/net/sal/src/sal_socket.c +++ b/components/net/sal/src/sal_socket.c @@ -18,7 +18,7 @@ #ifdef SAL_USING_TLS #include <sal_tls.h> #endif -#include <sal.h> +#include <sal_low_lvl.h> #include <netdev.h> #ifdef SAL_INTERNET_CHECK |