https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5985fe613bf17d20b886106ec047a8e97baa2bb5
commit 5985fe613bf17d20b886106ec047a8e97baa2bb5 Author: Timo Kreuzer <timo.kreu...@reactos.org> AuthorDate: Thu Jan 4 18:29:11 2018 +0100 ! Fix build of tracert # Conflicts: # sdk/include/psdk/ipexport.h --- sdk/include/psdk/ipexport.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/sdk/include/psdk/ipexport.h b/sdk/include/psdk/ipexport.h index 608952eec8..98cd3a9b82 100644 --- a/sdk/include/psdk/ipexport.h +++ b/sdk/include/psdk/ipexport.h @@ -37,6 +37,19 @@ struct ip_option_information unsigned char* OptionsData; }; +#if defined(_WIN64) + +struct ip_option_information32 +{ + unsigned char Ttl; + unsigned char Tos; + unsigned char Flags; + unsigned char OptionsSize; + unsigned char* POINTER_32 OptionsData; +}; + +#endif // _WIN64 + #define IP_FLAG_DF 0x2 #define IP_OPT_EOL 0 @@ -75,9 +88,11 @@ struct icmp_echo_reply32 unsigned short DataSize; unsigned short Reserved; void* POINTER_32 Data; - struct ip_option_information Options; + struct ip_option_information32 Options; }; +typedef struct ip_option_information32 IP_OPTION_INFORMATION32, *PIP_OPTION_INFORMATION32; + typedef struct icmp_echo_reply32 ICMP_ECHO_REPLY32, *PICMP_ECHO_REPLY32; #endif