提交 fc735381 编写于 作者: Lawlieta's avatar Lawlieta

[net][sal/at] Add components C++ support

上级 192b1775
...@@ -32,6 +32,10 @@ ...@@ -32,6 +32,10 @@
#include <netdb.h> #include <netdb.h>
#include <sys/socket.h> #include <sys/socket.h>
#ifdef __cplusplus
extern "C" {
#endif
#ifndef AT_SOCKET_RECV_BFSZ #ifndef AT_SOCKET_RECV_BFSZ
#define AT_SOCKET_RECV_BFSZ 512 #define AT_SOCKET_RECV_BFSZ 512
#endif #endif
...@@ -160,4 +164,8 @@ void at_scoket_device_register(const struct at_device_ops *ops); ...@@ -160,4 +164,8 @@ void at_scoket_device_register(const struct at_device_ops *ops);
#endif /* RT_USING_SAL */ #endif /* RT_USING_SAL */
#ifdef __cplusplus
}
#endif
#endif /* AT_SOCKET_H__ */ #endif /* AT_SOCKET_H__ */
...@@ -27,6 +27,9 @@ ...@@ -27,6 +27,9 @@
#include <rtthread.h> #include <rtthread.h>
#ifdef __cplusplus
extern "C" {
#endif
#define AT_SW_VERSION "0.3.0" #define AT_SW_VERSION "0.3.0"
#define DBG_ENABLE #define DBG_ENABLE
...@@ -251,4 +254,8 @@ void at_port_reset(void); ...@@ -251,4 +254,8 @@ void at_port_reset(void);
void at_port_factory_reset(void); void at_port_factory_reset(void);
#endif #endif
#ifdef __cplusplus
}
#endif
#endif /* __AT_H__ */ #endif /* __AT_H__ */
...@@ -27,6 +27,10 @@ ...@@ -27,6 +27,10 @@
#include <rtthread.h> #include <rtthread.h>
#ifdef __cplusplus
extern "C" {
#endif
#ifdef SAL_USING_LWIP #ifdef SAL_USING_LWIP
/* lwIP protocol family register */ /* lwIP protocol family register */
int lwip_inet_init(void); int lwip_inet_init(void);
...@@ -37,4 +41,8 @@ int lwip_inet_init(void); ...@@ -37,4 +41,8 @@ int lwip_inet_init(void);
int at_inet_init(void); int at_inet_init(void);
#endif #endif
#ifdef __cplusplus
}
#endif
#endif /* __AF_INET_H__ */ #endif /* __AF_INET_H__ */
...@@ -26,12 +26,12 @@ ...@@ -26,12 +26,12 @@
#ifndef DFS_NET_H__ #ifndef DFS_NET_H__
#define DFS_NET_H__ #define DFS_NET_H__
#include <dfs_file.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include <dfs_file.h>
const struct dfs_file_ops* dfs_net_get_fops(void); const struct dfs_file_ops* dfs_net_get_fops(void);
int dfs_net_getsocket(int fd); int dfs_net_getsocket(int fd);
......
...@@ -28,6 +28,10 @@ ...@@ -28,6 +28,10 @@
#include <dfs_file.h> #include <dfs_file.h>
#include <rtdevice.h> #include <rtdevice.h>
#ifdef __cplusplus
extern "C" {
#endif
#if !defined(socklen_t) && !defined(SOCKLEN_T_DEFINED) #if !defined(socklen_t) && !defined(SOCKLEN_T_DEFINED)
typedef uint32_t socklen_t; typedef uint32_t socklen_t;
#endif #endif
...@@ -103,4 +107,8 @@ int sal_proto_family_register(const struct proto_family *pf); ...@@ -103,4 +107,8 @@ int sal_proto_family_register(const struct proto_family *pf);
int sal_proto_family_unregister(const struct proto_family *pf); int sal_proto_family_unregister(const struct proto_family *pf);
struct proto_family *sal_proto_family_find(const char *name); struct proto_family *sal_proto_family_find(const char *name);
#ifdef __cplusplus
}
#endif
#endif /* SAL_H__ */ #endif /* SAL_H__ */
...@@ -26,6 +26,10 @@ ...@@ -26,6 +26,10 @@
#include "sal_type.h" #include "sal_type.h"
#ifdef __cplusplus
extern "C" {
#endif
/** IPv4 only: set the IP address given as an u32_t */ /** IPv4 only: set the IP address given as an u32_t */
#define ip4_addr_set_u32(dest_ipaddr, src_u32) ((dest_ipaddr)->addr = (src_u32)) #define ip4_addr_set_u32(dest_ipaddr, src_u32) ((dest_ipaddr)->addr = (src_u32))
/** IPv4 only: get the IP address as an u32_t */ /** IPv4 only: get the IP address as an u32_t */
......
...@@ -26,6 +26,10 @@ ...@@ -26,6 +26,10 @@
#include <sal_socket.h> #include <sal_socket.h>
#ifdef __cplusplus
extern "C" {
#endif
#define EAI_NONAME 200 #define EAI_NONAME 200
#define EAI_SERVICE 201 #define EAI_SERVICE 201
#define EAI_FAIL 202 #define EAI_FAIL 202
...@@ -88,4 +92,8 @@ int sal_getaddrinfo(const char *nodename, ...@@ -88,4 +92,8 @@ int sal_getaddrinfo(const char *nodename,
const struct addrinfo *hints, const struct addrinfo *hints,
struct addrinfo **res); struct addrinfo **res);
#ifdef __cplusplus
}
#endif
#endif /* SAL_NETDB_H__ */ #endif /* SAL_NETDB_H__ */
...@@ -27,6 +27,10 @@ ...@@ -27,6 +27,10 @@
#include "sal_ipaddr.h" #include "sal_ipaddr.h"
#ifdef __cplusplus
extern "C" {
#endif
#if !defined(socklen_t) && !defined(SOCKLEN_T_DEFINED) #if !defined(socklen_t) && !defined(SOCKLEN_T_DEFINED)
typedef uint32_t socklen_t; typedef uint32_t socklen_t;
#endif #endif
...@@ -175,4 +179,8 @@ int sal_socket(int domain, int type, int protocol); ...@@ -175,4 +179,8 @@ int sal_socket(int domain, int type, int protocol);
int sal_closesocket(int socket); int sal_closesocket(int socket);
int sal_ioctlsocket(int socket, long cmd, void *arg); int sal_ioctlsocket(int socket, long cmd, void *arg);
#ifdef __cplusplus
}
#endif
#endif /* SAL_SOCKET_H__ */ #endif /* SAL_SOCKET_H__ */
...@@ -28,6 +28,10 @@ ...@@ -28,6 +28,10 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h> #include <stdint.h>
#ifdef __cplusplus
extern "C" {
#endif
typedef int8_t err_t; typedef int8_t err_t;
typedef uint8_t u8_t; typedef uint8_t u8_t;
typedef int8_t s8_t; typedef int8_t s8_t;
...@@ -37,4 +41,8 @@ typedef uint32_t u32_t; ...@@ -37,4 +41,8 @@ typedef uint32_t u32_t;
typedef int32_t s32_t; typedef int32_t s32_t;
typedef uintptr_t mem_ptr_t; typedef uintptr_t mem_ptr_t;
#ifdef __cplusplus
}
#endif
#endif /* SAL_TYPE_H__ */ #endif /* SAL_TYPE_H__ */
...@@ -738,7 +738,6 @@ struct hostent *sal_gethostbyname(const char *name) ...@@ -738,7 +738,6 @@ struct hostent *sal_gethostbyname(const char *name)
{ {
return hst; return hst;
} }
continue;
} }
} }
...@@ -759,7 +758,6 @@ int sal_gethostbyname_r(const char *name, struct hostent *ret, char *buf, ...@@ -759,7 +758,6 @@ int sal_gethostbyname_r(const char *name, struct hostent *ret, char *buf,
{ {
return res; return res;
} }
continue;
} }
} }
...@@ -796,7 +794,6 @@ int sal_getaddrinfo(const char *nodename, ...@@ -796,7 +794,6 @@ int sal_getaddrinfo(const char *nodename,
{ {
return ret; return ret;
} }
continue;
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册