Add missing typedef keyword to avoid multiply-defined symbols.

rmcdonald at bittorrent.com rmcdonald at bittorrent.com
Wed Jun 2 14:07:50 CDT 2010


From: Robert McDonald <rmcdonald at bittorrent.com>

The section called 'Multicast group information' has definitions
that are missing the typedef keyword.
This results in definitions of global variables that result in
multiply-defined instances when this file is included by more than
one source file for source code being developed using winelib.
See bug # 22920.
---
 include/ws2ipdef.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h
index 9818fbd..11b3689 100644
--- a/include/ws2ipdef.h
+++ b/include/ws2ipdef.h
@@ -133,19 +133,19 @@ typedef struct WS(sockaddr_in6)
  * Multicast group information
  */
 
-struct WS(ip_mreq)
+typedef struct WS(ip_mreq)
 {
     struct WS(in_addr) imr_multiaddr;
     struct WS(in_addr) imr_interface;
 } WS(IP_MREQ), *WS(PIP_MREQ);
 
-struct WS(ip_mreq_source) {
+typedef struct WS(ip_mreq_source) {
     struct WS(in_addr) imr_multiaddr;
     struct WS(in_addr) imr_sourceaddr;
     struct WS(in_addr) imr_interface;
 } WS(IP_MREQ_SOURCE), *WS(PIP_MREQ_SOURCE);
 
-struct WS(ip_msfilter) {
+typedef struct WS(ip_msfilter) {
     struct WS(in_addr) imsf_multiaddr;
     struct WS(in_addr) imsf_interface;
     ULONG              imsf_fmode;
-- 
1.7.1.GIT




More information about the wine-patches mailing list