Re: [Mingw-w64-public] [PATCH] Revert "headers: Move IP_MREQ from _ip_mreq1.h to ws2ipdef.h."

[Biswapriyo Nath]

Forgot the patch file.
From 57fb78c373e609712ae159ac7b9ed51259afaa4b Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath 
Date: Sat, 26 Jun 2021 10:27:17 +0530
Subject: [PATCH] Revert "headers: Move IP_MREQ from _ip_mreq1.h to ws2ipdef.h."

This reverts commit 0c7108c439fcf349ec172843b022ccec5cef5da4
This revert fixes the build of SDL_net for x86 architecture.

Signed-off-by: Biswapriyo Nath 
---
 mingw-w64-headers/include/psdk_inc/_ip_mreq1.h | 9 +
 mingw-w64-headers/include/ws2ipdef.h   | 5 -
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/mingw-w64-headers/include/psdk_inc/_ip_mreq1.h 
b/mingw-w64-headers/include/psdk_inc/_ip_mreq1.h
index 5ca7bb3..1840ecb 100644
--- a/mingw-w64-headers/include/psdk_inc/_ip_mreq1.h
+++ b/mingw-w64-headers/include/psdk_inc/_ip_mreq1.h
@@ -4,9 +4,18 @@
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
+/*
+ * Shared data types between winsock and winsock2
+ */
+
 #ifndef _MINGW_IP_MREQ1_H
 #define _MINGW_IP_MREQ1_H
 
 #include 
 
+typedef struct ip_mreq {
+  struct in_addr imr_multiaddr;
+  struct in_addr imr_interface;
+} IP_MREQ, *PIP_MREQ;
+
 #endif /* _MINGW_IP_MREQ1_H */
diff --git a/mingw-w64-headers/include/ws2ipdef.h 
b/mingw-w64-headers/include/ws2ipdef.h
index 188b2f4..d440bbc 100644
--- a/mingw-w64-headers/include/ws2ipdef.h
+++ b/mingw-w64-headers/include/ws2ipdef.h
@@ -192,11 +192,6 @@ typedef enum _MULTICAST_MODE_TYPE {
   MCAST_EXCLUDE
 } MULTICAST_MODE_TYPE;
 
-typedef struct ip_mreq {
-  IN_ADDR imr_multiaddr;
-  IN_ADDR imr_interface;
-} IP_MREQ, *PIP_MREQ;
-
 typedef struct ip_mreq_source {
   IN_ADDR imr_multiaddr;
   IN_ADDR imr_sourceaddr;
-- 
2.32.0

___
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

[Mingw-w64-public] [PATCH] Revert "headers: Move IP_MREQ from _ip_mreq1.h to ws2ipdef.h."

[Biswapriyo Nath]

My apology for this mistake. I am not sure why this causes build issue
in SDL_net https://github.com/msys2/MINGW-packages/issues/8759. /cc
Ozkan Sezer


___
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

Re: [Mingw-w64-public] [PATCH] headers: Add MsvAvSingleHost in MSV1_0_AVID enum.

[Liu Hao]

在 2021-06-25 12:39, Biswapriyo Nath 写道:

0001-headers-Add-MsvAvSingleHost-in-MSV1_0_AVID-enum.patch

 From 10e2039d440aab444532fffd394f5be9b56deb1a Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath
Date: Fri, 25 Jun 2021 10:06:06 +0530
Subject: [PATCH] headers: Add MsvAvSingleHost in MSV1_0_AVID enum.

MsvAvSingleHost present in MS-NLMP specifications[1] but not in WinSDK
[1]:https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-nlmp/

Signed-off-by: Biswapriyo Nath
---
  mingw-w64-headers/ddk/include/ddk/ntifs.h | 2 ++
  mingw-w64-headers/include/ntsecapi.h  | 2 ++
  2 files changed, 4 insertions(+)


Thanks. This patch looks good to me. Pushed.



--
Best regards,
Liu Hao



OpenPGP_signature
Description: OpenPGP digital signature
___
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public