Fixes #9873. Minor header/api changes for Windows compile of multicas…

…t socket to succeed.
MythTV · Jun 27, 2011 · bd5dbc4 · bd5dbc4
1 parent e25a351
commit bd5dbc4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/mythtv/libs/libmythupnp/mmulticastsocketdevice.cpp b/mythtv/libs/libmythupnp/mmulticastsocketdevice.cpp
@@ -115,9 +115,7 @@ qint64 MMulticastSocketDevice::writeBlock(
             if (addr == "127.0.0.1")
                 continue; // skip localhost address
 
-            struct in_addr interface_addr;
-            inet_pton(AF_INET, addr.toAscii().constData(),
-                      (char*)&interface_addr);
+            uint32_t interface_addr = (*it).toIPv4Address();
             setsockopt(socket(), IPPROTO_IP, IP_MULTICAST_IF,
                        &interface_addr, sizeof(interface_addr));
             retx = MSocketDevice::writeBlock(data, len, host, port);

diff --git a/mythtv/libs/libmythupnp/mmulticastsocketdevice.h b/mythtv/libs/libmythupnp/mmulticastsocketdevice.h
@@ -24,9 +24,13 @@
 #ifndef _MULTICAST_SOCKET_DEVICE_H_
 #define _MULTICAST_SOCKET_DEVICE_H_
 
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
+#ifdef _WIN32
+# include <ws2tcpip.h>
+#else
+# include <sys/socket.h>
+# include <netinet/in.h>
+# include <netinet/ip.h>
+#endif
 
 // Qt headers
 #include <QNetworkInterface>