Merge pull request #32 from stepas-toliautas/gcc510-compat

Update mspms.h to be compatible with MinGW GCC <= 5.1.0
microsoft · May 13, 2020 · 7ff6bdc · 7ff6bdc
2 parents 1dbbaee + 12244d3
commit 7ff6bdc
Showing 1 changed file with 20 additions and 0 deletions.
diff --git a/src/include/mspms.h b/src/include/mspms.h
@@ -49,6 +49,17 @@ DEFINE_GUID(
 #endif
 
 #include <WS2tcpip.h>
+#if !defined(_WS2IPDEF_) && !defined(_INC_WS2IPDEF) // latter for GCC 4.9.2
+
+typedef u_short ADDRESS_FAMILY;
+
+typedef union _SOCKADDR_INET {
+  SOCKADDR_IN    Ipv4;
+  SOCKADDR_IN6   Ipv6;
+  ADDRESS_FAMILY si_family;
+} SOCKADDR_INET, *PSOCKADDR_INET;
+
+#endif
 #include <windows.h>
 
 
@@ -73,6 +84,15 @@ DEFINE_GUID(
 #ifndef _Outptr_
 #define _Outptr_
 #endif
+#ifndef _In_opt_
+#define _In_opt_
+#endif
+#ifndef _Out_opt_
+#define _Out_opt_
+#endif
+#ifndef _Outptr_opt_
+#define _Outptr_opt_
+#endif
 
 
 #define MSPMS_MAX_NAME_LENGTH 256