inet_* functions on Windows
Unfortunately, these headers are "interesting" on Windows. They
absolutely have to be included prior to <windows.h> which is included
from other system headers (nu surprise there). In some earlier version
of this patch this was not a problem, but I suspect that our
config.h-ification for the `LIBYANG_API_{DEF,DECL}` made stuff more
complex :(.
TL;DR: make sure that our "compat.h" goes in first, otherwise Bad
Things™ happen.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea4b625..0443057 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -367,7 +367,7 @@
include_directories(${COMPAT_POSIX_INCLUDES})
find_package(pthreads REQUIRED)
- set(COMPAT_WIN_LIBRARIES PThreads4W::PThreads4W shlwapi.lib)
+ set(COMPAT_WIN_LIBRARIES PThreads4W::PThreads4W shlwapi.lib ws2_32)
target_link_libraries(yang ${COMPAT_WIN_LIBRARIES})
endif()
diff --git a/compat/compat.h.in b/compat/compat.h.in
index df9449b..0f99765 100644
--- a/compat/compat.h.in
+++ b/compat/compat.h.in
@@ -15,6 +15,12 @@
#ifndef _COMPAT_H_
#define _COMPAT_H_
+#ifdef _WIN32
+/* headers are broken on Windows, which means that some of them simply *have* to come first */
+# include <winsock2.h>
+# include <ws2tcpip.h>
+#endif
+
#include <limits.h>
#include <pthread.h>
#include <stdarg.h>
diff --git a/compat/posix-shims/unistd.h b/compat/posix-shims/unistd.h
index 85040b2..95bcecc 100644
--- a/compat/posix-shims/unistd.h
+++ b/compat/posix-shims/unistd.h
@@ -1,6 +1,10 @@
#ifndef _UNISTD_H
#define _UNISTD_H 1
+/* headers are broken on Windows, which means that some of them simply *have* to come first */
+# include <winsock2.h>
+# include <ws2tcpip.h>
+
/* This is intended as a drop-in replacement for unistd.h on Windows.
* Please add functionality as neeeded.
* https://stackoverflow.com/a/826027/1202830
diff --git a/src/config.h.in b/src/config.h.in
index 4f53f2e..af3d1f0 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -15,6 +15,12 @@
#ifndef LY_CONFIG_H_
#define LY_CONFIG_H_
+#ifdef _WIN32
+/* headers are broken on Windows, which means that some of them simply *have* to come first */
+# include <winsock2.h>
+# include <ws2tcpip.h>
+#endif
+
/** size of fixed_mem in lyd_value, minimum is 8 (B) */
#define LYD_VALUE_FIXED_MEM_SIZE @LYD_VALUE_SIZE@
diff --git a/src/plugins_types/ipv4_address.c b/src/plugins_types/ipv4_address.c
index c4e06ce..f7b297c 100644
--- a/src/plugins_types/ipv4_address.c
+++ b/src/plugins_types/ipv4_address.c
@@ -16,10 +16,15 @@
#include "plugins_types.h"
-#include <arpa/inet.h>
-#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
-#include <netinet/in.h>
-#include <sys/socket.h>
+#ifdef _WIN32
+# include <winsock2.h>
+# include <ws2tcpip.h>
+#else
+# include <arpa/inet.h>
+# if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
+# include <netinet/in.h>
+# include <sys/socket.h>
+# endif
#endif
#include <ctype.h>
#include <errno.h>
diff --git a/src/plugins_types/ipv4_address_no_zone.c b/src/plugins_types/ipv4_address_no_zone.c
index 1e30e4f..91fe677 100644
--- a/src/plugins_types/ipv4_address_no_zone.c
+++ b/src/plugins_types/ipv4_address_no_zone.c
@@ -16,10 +16,15 @@
#include "plugins_types.h"
-#include <arpa/inet.h>
-#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
-#include <netinet/in.h>
-#include <sys/socket.h>
+#ifdef _WIN32
+# include <winsock2.h>
+# include <ws2tcpip.h>
+#else
+# include <arpa/inet.h>
+# if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
+# include <netinet/in.h>
+# include <sys/socket.h>
+# endif
#endif
#include <errno.h>
#include <stdint.h>
diff --git a/src/plugins_types/ipv4_prefix.c b/src/plugins_types/ipv4_prefix.c
index 8f38c3e..6f13eee 100644
--- a/src/plugins_types/ipv4_prefix.c
+++ b/src/plugins_types/ipv4_prefix.c
@@ -16,10 +16,15 @@
#include "plugins_types.h"
-#include <arpa/inet.h>
-#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
-#include <netinet/in.h>
-#include <sys/socket.h>
+#ifdef _WIN32
+# include <winsock2.h>
+# include <ws2tcpip.h>
+#else
+# include <arpa/inet.h>
+# if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
+# include <netinet/in.h>
+# include <sys/socket.h>
+# endif
#endif
#include <stdint.h>
#include <stdlib.h>
diff --git a/src/plugins_types/ipv6_address.c b/src/plugins_types/ipv6_address.c
index 1204633..74f5c62 100644
--- a/src/plugins_types/ipv6_address.c
+++ b/src/plugins_types/ipv6_address.c
@@ -16,10 +16,15 @@
#include "plugins_types.h"
-#include <arpa/inet.h>
-#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
-#include <netinet/in.h>
-#include <sys/socket.h>
+#ifdef _WIN32
+# include <winsock2.h>
+# include <ws2tcpip.h>
+#else
+# include <arpa/inet.h>
+# if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
+# include <netinet/in.h>
+# include <sys/socket.h>
+# endif
#endif
#include <ctype.h>
#include <errno.h>
diff --git a/src/plugins_types/ipv6_address_no_zone.c b/src/plugins_types/ipv6_address_no_zone.c
index 8af2581..26fbf80 100644
--- a/src/plugins_types/ipv6_address_no_zone.c
+++ b/src/plugins_types/ipv6_address_no_zone.c
@@ -16,10 +16,15 @@
#include "plugins_types.h"
-#include <arpa/inet.h>
-#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
-#include <netinet/in.h>
-#include <sys/socket.h>
+#ifdef _WIN32
+# include <winsock2.h>
+# include <ws2tcpip.h>
+#else
+# include <arpa/inet.h>
+# if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
+# include <netinet/in.h>
+# include <sys/socket.h>
+# endif
#endif
#include <errno.h>
#include <stdint.h>
diff --git a/src/plugins_types/ipv6_prefix.c b/src/plugins_types/ipv6_prefix.c
index 0027df2..8e62311 100644
--- a/src/plugins_types/ipv6_prefix.c
+++ b/src/plugins_types/ipv6_prefix.c
@@ -16,10 +16,15 @@
#include "plugins_types.h"
-#include <arpa/inet.h>
-#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
-#include <netinet/in.h>
-#include <sys/socket.h>
+#ifdef _WIN32
+# include <winsock2.h>
+# include <ws2tcpip.h>
+#else
+# include <arpa/inet.h>
+# if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
+# include <netinet/in.h>
+# include <sys/socket.h>
+# endif
#endif
#include <stdint.h>
#include <stdlib.h>
diff --git a/src/tree_data.h b/src/tree_data.h
index acbb7c2..24b9458 100644
--- a/src/tree_data.h
+++ b/src/tree_data.h
@@ -16,10 +16,15 @@
#ifndef LY_TREE_DATA_H_
#define LY_TREE_DATA_H_
-#include <arpa/inet.h>
-#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
-#include <netinet/in.h>
-#include <sys/socket.h>
+#ifdef _WIN32
+# include <winsock2.h>
+# include <ws2tcpip.h>
+#else
+# include <arpa/inet.h>
+# if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
+# include <netinet/in.h>
+# include <sys/socket.h>
+# endif
#endif
#include <stddef.h>
#include <stdint.h>