Parcourir la source

rename sal.h as sal_low_lvl.h

Meco Man il y a 3 ans
Parent
commit
2575a93516

+ 1 - 1
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"

+ 1 - 1
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>

+ 1 - 1
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>

+ 1 - 1
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>
 

+ 4 - 2
components/net/sal/include/sal.h → 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>
 

+ 1 - 1
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

+ 1 - 1
documentation/sal/sal.md

@@ -719,7 +719,7 @@ The following is the access registration process implemented by AT Socket networ
 ```c
 #include <rtthread.h>
 #include <netdb.h>
-#include <sal.h>            /* SAL component structure holds the header file */
+#include <sal_low_lvl.h>            /* SAL component structure holds the header file */
 #include <at_socket.h>      /* AT Socket related header file */
 #include <af_inet.h>