Jacek Caban : iphlpapi: Use nameless unions.

Alexandre Julliard julliard at winehq.org
Thu Mar 25 16:49:23 CDT 2021


Module: wine
Branch: master
Commit: 1fe893a9efa09c194bcc832864d94684d7e70e06
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=1fe893a9efa09c194bcc832864d94684d7e70e06

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Thu Mar 25 21:40:09 2021 +0100

iphlpapi: Use nameless unions.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/iphlpapi/Makefile.in |  1 -
 dlls/iphlpapi/ipstats.c   | 12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dlls/iphlpapi/Makefile.in b/dlls/iphlpapi/Makefile.in
index e65e9c7e474..3a2227f5ebb 100644
--- a/dlls/iphlpapi/Makefile.in
+++ b/dlls/iphlpapi/Makefile.in
@@ -2,7 +2,6 @@ MODULE    = iphlpapi.dll
 IMPORTLIB = iphlpapi
 IMPORTS   = advapi32
 EXTRALIBS = $(RESOLV_LIBS) $(KSTAT_LIBS) $(PROCSTAT_LIBS)
-EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
 
 C_SRCS = \
 	icmp.c \
diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c
index 36f90f2c3a8..a15a0abad22 100644
--- a/dlls/iphlpapi/ipstats.c
+++ b/dlls/iphlpapi/ipstats.c
@@ -2437,7 +2437,7 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE
                 if (class >= UDP_TABLE_OWNER_MODULE)
                 {
                     row.liCreateTimestamp.QuadPart = 0; /* FIXME */
-                    row.u.dwFlags = 0;
+                    row.dwFlags = 0;
                     memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) );
                 }
                 if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size )))
@@ -2547,8 +2547,8 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE
             if (class >= UDP_TABLE_OWNER_MODULE)
             {
                 row.liCreateTimestamp.QuadPart = 0; /* FIXME */
-                row.u.dwFlags = 0;
-                row.u.SpecificPortBind = !(pINData->inp_flags & INP_ANONPORT);
+                row.dwFlags = 0;
+                row.SpecificPortBind = !(pINData->inp_flags & INP_ANONPORT);
                 memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) );
             }
             if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size )))
@@ -3087,7 +3087,7 @@ DWORD build_udp6_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE
                 if (class >= UDP_TABLE_OWNER_MODULE)
                 {
                     row.liCreateTimestamp.QuadPart = 0; /* FIXME */
-                    row.u.dwFlags = 0;
+                    row.dwFlags = 0;
                     memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) );
                 }
                 if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size )))
@@ -3185,8 +3185,8 @@ DWORD build_udp6_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE
             if (class >= UDP_TABLE_OWNER_MODULE)
             {
                 row.liCreateTimestamp.QuadPart = 0; /* FIXME */
-                row.u.dwFlags = 0;
-                row.u.SpecificPortBind = !(in->inp_flags & INP_ANONPORT);
+                row.dwFlags = 0;
+                row.SpecificPortBind = !(in->inp_flags & INP_ANONPORT);
                 memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) );
             }
             if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size )))




More information about the wine-cvs mailing list