Browse Source

Move platforms `asio` includes to Source

pull/3688/head
Gleb Mazovetskiy 4 years ago committed by Anders Jenbo
parent
commit
d0ed505765
  1. 2
      CMake/platforms/ctr/asio_defs.cmake
  2. 2
      CMake/platforms/switch/asio_defs.cmake
  3. 0
      Source/platform/ctr/asio/include/errno.h
  4. 4
      Source/platform/ctr/asio/include/net/if.h
  5. 0
      Source/platform/ctr/asio/include/netdb.h
  6. 16
      Source/platform/ctr/asio/include/netinet/in.h
  7. 0
      Source/platform/ctr/asio/include/sys/ioctl.h
  8. 0
      Source/platform/ctr/asio/include/sys/poll.h
  9. 14
      Source/platform/ctr/asio/include/sys/socket.h
  10. 4
      Source/platform/ctr/asio/include/sys/uio.h
  11. 4
      Source/platform/ctr/asio/include/sys/un.h
  12. 0
      Source/platform/switch/asio/include/errno.h
  13. 4
      Source/platform/switch/asio/include/net/if.h
  14. 4
      Source/platform/switch/asio/include/netinet/in.h
  15. 2
      Source/platform/switch/asio/include/sys/uio.h
  16. 6
      Source/platform/switch/asio/include/sys/un.h

2
CMake/platforms/ctr/asio_defs.cmake

@ -3,4 +3,4 @@ target_compile_definitions(asio INTERFACE
ASIO_HAS_UNISTD_H=ON) ASIO_HAS_UNISTD_H=ON)
# Missing headers and declarations provided by DevilutionX # Missing headers and declarations provided by DevilutionX
target_include_directories(asio BEFORE INTERFACE ${CMAKE_CURRENT_LIST_DIR}/asio/include) target_include_directories(asio BEFORE INTERFACE ${DevilutionX_SOURCE_DIR}/Source/platform/ctr/asio/include)

2
CMake/platforms/switch/asio_defs.cmake

@ -2,4 +2,4 @@
target_compile_definitions(asio INTERFACE _DEFAULT_SOURCE=ON) target_compile_definitions(asio INTERFACE _DEFAULT_SOURCE=ON)
# Missing headers and declarations provided by DevilutionX # Missing headers and declarations provided by DevilutionX
target_include_directories(asio BEFORE INTERFACE ${CMAKE_CURRENT_LIST_DIR}/asio/include) target_include_directories(asio BEFORE INTERFACE ${DevilutionX_SOURCE_DIR}/Source/platform/switch/asio/include)

0
CMake/platforms/ctr/asio/include/errno.h → Source/platform/ctr/asio/include/errno.h

4
CMake/platforms/ctr/asio/include/net/if.h → Source/platform/ctr/asio/include/net/if.h

@ -4,8 +4,8 @@
#define IF_NAMESIZE 16 #define IF_NAMESIZE 16
struct if_nameindex { struct if_nameindex {
unsigned int if_index; unsigned int if_index;
char *if_name; char *if_name;
}; };
#ifdef __cplusplus #ifdef __cplusplus

0
CMake/platforms/ctr/asio/include/netdb.h → Source/platform/ctr/asio/include/netdb.h

16
CMake/platforms/ctr/asio/include/netinet/in.h → Source/platform/ctr/asio/include/netinet/in.h

@ -3,20 +3,20 @@
#include_next <netinet/in.h> #include_next <netinet/in.h>
struct in6_addr { struct in6_addr {
uint8_t s6_addr[16]; uint8_t s6_addr[16];
}; };
struct ipv6_mreq { struct ipv6_mreq {
struct in6_addr ipv6mr_multiaddr; struct in6_addr ipv6mr_multiaddr;
unsigned ipv6mr_interface; unsigned ipv6mr_interface;
}; };
struct sockaddr_in6 { struct sockaddr_in6 {
sa_family_t sin6_family; sa_family_t sin6_family;
in_port_t sin6_port; in_port_t sin6_port;
uint32_t sin6_flowinfo; uint32_t sin6_flowinfo;
struct in6_addr sin6_addr; struct in6_addr sin6_addr;
uint32_t sin6_scope_id; uint32_t sin6_scope_id;
}; };
#define IPPROTO_IPV6 -1 #define IPPROTO_IPV6 -1

0
CMake/platforms/ctr/asio/include/sys/ioctl.h → Source/platform/ctr/asio/include/sys/ioctl.h

0
CMake/platforms/ctr/asio/include/sys/poll.h → Source/platform/ctr/asio/include/sys/poll.h

14
CMake/platforms/ctr/asio/include/sys/socket.h → Source/platform/ctr/asio/include/sys/socket.h

@ -9,13 +9,13 @@
#define MSG_EOR 0 #define MSG_EOR 0
struct msghdr { struct msghdr {
void *msg_name; void *msg_name;
socklen_t msg_namelen; socklen_t msg_namelen;
struct iovec *msg_iov; struct iovec *msg_iov;
int msg_iovlen; int msg_iovlen;
void *msg_control; void *msg_control;
socklen_t msg_controllen; socklen_t msg_controllen;
int msg_flags; int msg_flags;
}; };
#ifdef __cplusplus #ifdef __cplusplus

4
CMake/platforms/ctr/asio/include/sys/uio.h → Source/platform/ctr/asio/include/sys/uio.h

@ -4,8 +4,8 @@
#include <sys/types.h> #include <sys/types.h>
struct iovec { struct iovec {
void *iov_base; void *iov_base;
size_t iov_len; size_t iov_len;
}; };
ssize_t readv(int __fd, const struct iovec *__iovec, int __count); ssize_t readv(int __fd, const struct iovec *__iovec, int __count);

4
CMake/platforms/ctr/asio/include/sys/un.h → Source/platform/ctr/asio/include/sys/un.h

@ -4,8 +4,8 @@
typedef unsigned short int sa_family_t; typedef unsigned short int sa_family_t;
struct sockaddr_un { struct sockaddr_un {
sa_family_t sun_family; sa_family_t sun_family;
char sun_path[108]; char sun_path[108];
}; };
#endif #endif

0
CMake/platforms/switch/asio/include/errno.h → Source/platform/switch/asio/include/errno.h

4
CMake/platforms/switch/asio/include/net/if.h → Source/platform/switch/asio/include/net/if.h

@ -4,8 +4,8 @@
#define IF_NAMESIZE 16 #define IF_NAMESIZE 16
struct if_nameindex { struct if_nameindex {
unsigned int if_index; unsigned int if_index;
char *if_name; char *if_name;
}; };
#ifdef __cplusplus #ifdef __cplusplus

4
CMake/platforms/switch/asio/include/netinet/in.h → Source/platform/switch/asio/include/netinet/in.h

@ -3,6 +3,6 @@
#include_next <netinet/in.h> #include_next <netinet/in.h>
struct ipv6_mreq { struct ipv6_mreq {
struct in6_addr ipv6mr_multiaddr; struct in6_addr ipv6mr_multiaddr;
unsigned ipv6mr_interface; unsigned ipv6mr_interface;
}; };

2
CMake/platforms/switch/asio/include/sys/uio.h → Source/platform/switch/asio/include/sys/uio.h

@ -1,8 +1,8 @@
#ifndef _SYS_UIO_H #ifndef _SYS_UIO_H
#define _SYS_UIO_H 1 #define _SYS_UIO_H 1
#include <sys/types.h>
#include <sys/_iovec.h> #include <sys/_iovec.h>
#include <sys/types.h>
ssize_t readv(int __fd, const struct iovec *__iovec, int __count); ssize_t readv(int __fd, const struct iovec *__iovec, int __count);
ssize_t writev(int __fd, const struct iovec *__iovec, int __count); ssize_t writev(int __fd, const struct iovec *__iovec, int __count);

6
CMake/platforms/switch/asio/include/sys/un.h → Source/platform/switch/asio/include/sys/un.h

@ -5,12 +5,12 @@
#ifndef _SA_FAMILY_T_DECLARED #ifndef _SA_FAMILY_T_DECLARED
typedef __sa_family_t sa_family_t; typedef __sa_family_t sa_family_t;
#define _SA_FAMILY_T_DECLARED #define _SA_FAMILY_T_DECLARED
#endif #endif
struct sockaddr_un { struct sockaddr_un {
sa_family_t sun_family; sa_family_t sun_family;
char sun_path[108]; char sun_path[108];
}; };
#endif #endif
Loading…
Cancel
Save