diff --git a/CMake/platforms/ctr/asio_defs.cmake b/CMake/platforms/ctr/asio_defs.cmake index e778bdfa7..6f180963d 100644 --- a/CMake/platforms/ctr/asio_defs.cmake +++ b/CMake/platforms/ctr/asio_defs.cmake @@ -3,4 +3,4 @@ target_compile_definitions(asio INTERFACE ASIO_HAS_UNISTD_H=ON) # 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) diff --git a/CMake/platforms/switch/asio_defs.cmake b/CMake/platforms/switch/asio_defs.cmake index a96bc496a..1000f786b 100644 --- a/CMake/platforms/switch/asio_defs.cmake +++ b/CMake/platforms/switch/asio_defs.cmake @@ -2,4 +2,4 @@ target_compile_definitions(asio INTERFACE _DEFAULT_SOURCE=ON) # 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) diff --git a/CMake/platforms/ctr/asio/include/errno.h b/Source/platform/ctr/asio/include/errno.h similarity index 100% rename from CMake/platforms/ctr/asio/include/errno.h rename to Source/platform/ctr/asio/include/errno.h diff --git a/CMake/platforms/ctr/asio/include/net/if.h b/Source/platform/ctr/asio/include/net/if.h similarity index 89% rename from CMake/platforms/ctr/asio/include/net/if.h rename to Source/platform/ctr/asio/include/net/if.h index d2fa1021f..21ae962ff 100644 --- a/CMake/platforms/ctr/asio/include/net/if.h +++ b/Source/platform/ctr/asio/include/net/if.h @@ -4,8 +4,8 @@ #define IF_NAMESIZE 16 struct if_nameindex { - unsigned int if_index; - char *if_name; + unsigned int if_index; + char *if_name; }; #ifdef __cplusplus diff --git a/CMake/platforms/ctr/asio/include/netdb.h b/Source/platform/ctr/asio/include/netdb.h similarity index 100% rename from CMake/platforms/ctr/asio/include/netdb.h rename to Source/platform/ctr/asio/include/netdb.h diff --git a/CMake/platforms/ctr/asio/include/netinet/in.h b/Source/platform/ctr/asio/include/netinet/in.h similarity index 60% rename from CMake/platforms/ctr/asio/include/netinet/in.h rename to Source/platform/ctr/asio/include/netinet/in.h index 67972fb27..096c101f4 100644 --- a/CMake/platforms/ctr/asio/include/netinet/in.h +++ b/Source/platform/ctr/asio/include/netinet/in.h @@ -3,20 +3,20 @@ #include_next struct in6_addr { - uint8_t s6_addr[16]; + uint8_t s6_addr[16]; }; struct ipv6_mreq { - struct in6_addr ipv6mr_multiaddr; - unsigned ipv6mr_interface; + struct in6_addr ipv6mr_multiaddr; + unsigned ipv6mr_interface; }; struct sockaddr_in6 { - sa_family_t sin6_family; - in_port_t sin6_port; - uint32_t sin6_flowinfo; - struct in6_addr sin6_addr; - uint32_t sin6_scope_id; + sa_family_t sin6_family; + in_port_t sin6_port; + uint32_t sin6_flowinfo; + struct in6_addr sin6_addr; + uint32_t sin6_scope_id; }; #define IPPROTO_IPV6 -1 diff --git a/CMake/platforms/ctr/asio/include/sys/ioctl.h b/Source/platform/ctr/asio/include/sys/ioctl.h similarity index 100% rename from CMake/platforms/ctr/asio/include/sys/ioctl.h rename to Source/platform/ctr/asio/include/sys/ioctl.h diff --git a/CMake/platforms/ctr/asio/include/sys/poll.h b/Source/platform/ctr/asio/include/sys/poll.h similarity index 100% rename from CMake/platforms/ctr/asio/include/sys/poll.h rename to Source/platform/ctr/asio/include/sys/poll.h diff --git a/CMake/platforms/ctr/asio/include/sys/socket.h b/Source/platform/ctr/asio/include/sys/socket.h similarity index 74% rename from CMake/platforms/ctr/asio/include/sys/socket.h rename to Source/platform/ctr/asio/include/sys/socket.h index 3ac951138..08a5476eb 100644 --- a/CMake/platforms/ctr/asio/include/sys/socket.h +++ b/Source/platform/ctr/asio/include/sys/socket.h @@ -9,13 +9,13 @@ #define MSG_EOR 0 struct msghdr { - void *msg_name; - socklen_t msg_namelen; - struct iovec *msg_iov; - int msg_iovlen; - void *msg_control; - socklen_t msg_controllen; - int msg_flags; + void *msg_name; + socklen_t msg_namelen; + struct iovec *msg_iov; + int msg_iovlen; + void *msg_control; + socklen_t msg_controllen; + int msg_flags; }; #ifdef __cplusplus diff --git a/CMake/platforms/ctr/asio/include/sys/uio.h b/Source/platform/ctr/asio/include/sys/uio.h similarity index 86% rename from CMake/platforms/ctr/asio/include/sys/uio.h rename to Source/platform/ctr/asio/include/sys/uio.h index 4b9660574..8b2c21972 100644 --- a/CMake/platforms/ctr/asio/include/sys/uio.h +++ b/Source/platform/ctr/asio/include/sys/uio.h @@ -4,8 +4,8 @@ #include struct iovec { - void *iov_base; - size_t iov_len; + void *iov_base; + size_t iov_len; }; ssize_t readv(int __fd, const struct iovec *__iovec, int __count); diff --git a/CMake/platforms/ctr/asio/include/sys/un.h b/Source/platform/ctr/asio/include/sys/un.h similarity index 70% rename from CMake/platforms/ctr/asio/include/sys/un.h rename to Source/platform/ctr/asio/include/sys/un.h index 7456cf4c7..db574359a 100644 --- a/CMake/platforms/ctr/asio/include/sys/un.h +++ b/Source/platform/ctr/asio/include/sys/un.h @@ -4,8 +4,8 @@ typedef unsigned short int sa_family_t; struct sockaddr_un { - sa_family_t sun_family; - char sun_path[108]; + sa_family_t sun_family; + char sun_path[108]; }; #endif diff --git a/CMake/platforms/switch/asio/include/errno.h b/Source/platform/switch/asio/include/errno.h similarity index 100% rename from CMake/platforms/switch/asio/include/errno.h rename to Source/platform/switch/asio/include/errno.h diff --git a/CMake/platforms/switch/asio/include/net/if.h b/Source/platform/switch/asio/include/net/if.h similarity index 89% rename from CMake/platforms/switch/asio/include/net/if.h rename to Source/platform/switch/asio/include/net/if.h index d2fa1021f..21ae962ff 100644 --- a/CMake/platforms/switch/asio/include/net/if.h +++ b/Source/platform/switch/asio/include/net/if.h @@ -4,8 +4,8 @@ #define IF_NAMESIZE 16 struct if_nameindex { - unsigned int if_index; - char *if_name; + unsigned int if_index; + char *if_name; }; #ifdef __cplusplus diff --git a/CMake/platforms/switch/asio/include/netinet/in.h b/Source/platform/switch/asio/include/netinet/in.h similarity index 50% rename from CMake/platforms/switch/asio/include/netinet/in.h rename to Source/platform/switch/asio/include/netinet/in.h index 4b1a8f919..9081497aa 100644 --- a/CMake/platforms/switch/asio/include/netinet/in.h +++ b/Source/platform/switch/asio/include/netinet/in.h @@ -3,6 +3,6 @@ #include_next struct ipv6_mreq { - struct in6_addr ipv6mr_multiaddr; - unsigned ipv6mr_interface; + struct in6_addr ipv6mr_multiaddr; + unsigned ipv6mr_interface; }; diff --git a/CMake/platforms/switch/asio/include/sys/uio.h b/Source/platform/switch/asio/include/sys/uio.h similarity index 100% rename from CMake/platforms/switch/asio/include/sys/uio.h rename to Source/platform/switch/asio/include/sys/uio.h index 4c3761916..f70f6dba6 100644 --- a/CMake/platforms/switch/asio/include/sys/uio.h +++ b/Source/platform/switch/asio/include/sys/uio.h @@ -1,8 +1,8 @@ #ifndef _SYS_UIO_H #define _SYS_UIO_H 1 -#include #include +#include ssize_t readv(int __fd, const struct iovec *__iovec, int __count); ssize_t writev(int __fd, const struct iovec *__iovec, int __count); diff --git a/CMake/platforms/switch/asio/include/sys/un.h b/Source/platform/switch/asio/include/sys/un.h similarity index 68% rename from CMake/platforms/switch/asio/include/sys/un.h rename to Source/platform/switch/asio/include/sys/un.h index 12a786d8c..d3463f63e 100644 --- a/CMake/platforms/switch/asio/include/sys/un.h +++ b/Source/platform/switch/asio/include/sys/un.h @@ -5,12 +5,12 @@ #ifndef _SA_FAMILY_T_DECLARED typedef __sa_family_t sa_family_t; -#define _SA_FAMILY_T_DECLARED +#define _SA_FAMILY_T_DECLARED #endif struct sockaddr_un { - sa_family_t sun_family; - char sun_path[108]; + sa_family_t sun_family; + char sun_path[108]; }; #endif