From: R.E. Wolff <R.E.Wolff@BitWizard.nl>
Date: Sat, 3 Jun 2017 17:01:04 +0000 (+0200)
Subject: minor changes top help Windows compilation on 32 bit machines
X-Git-Tag: v0.93~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4924a3fd96eb912f180b680c28a7e3e5839074f6;p=thirdparty%2Fmtr.git

minor changes top help Windows compilation on 32 bit machines
---

diff --git a/packet/probe_cygwin.c b/packet/probe_cygwin.c
index 56bd2b9..a37c5c6 100644
--- a/packet/probe_cygwin.c
+++ b/packet/probe_cygwin.c
@@ -139,7 +139,7 @@ void WINAPI on_icmp_reply(
     struct sockaddr_storage remote_addr;
     struct sockaddr_in *remote_addr4;
     struct sockaddr_in6 *remote_addr6;
-    ICMP_ECHO_REPLY32 *reply4;
+    ICMP_ECHO_REPLY *reply4;
     ICMPV6_ECHO_REPLY *reply6;
 
     if (probe->platform.ip_version == 6) {
@@ -230,13 +230,13 @@ void icmp_send_probe(
         timeout = 1;
     }
 
-    memset(&option, 0, sizeof(IP_OPTION_INFORMATION32));
+    memset(&option, 0, sizeof(IP_OPTION_INFORMATION));
     option.Ttl = param->ttl;
 
     if (param->ip_version == 6) {
         reply_size = sizeof(ICMPV6_ECHO_REPLY) + payload_size;
     } else {
-        reply_size = sizeof(ICMP_ECHO_REPLY32) + payload_size;
+        reply_size = sizeof(ICMP_ECHO_REPLY) + payload_size;
     }
 
     probe->platform.reply4 = malloc(reply_size);
diff --git a/packet/probe_cygwin.h b/packet/probe_cygwin.h
index 29ef982..270e715 100644
--- a/packet/probe_cygwin.h
+++ b/packet/probe_cygwin.h
@@ -60,7 +60,7 @@ struct probe_platform_t {
     int ip_version;
 
     union {
-        ICMP_ECHO_REPLY32 *reply4;
+        ICMP_ECHO_REPLY *reply4;
         ICMPV6_ECHO_REPLY *reply6;
     };
 };