From 6601f1f343b513081c51ad5570b4ecac8674af79 Mon Sep 17 00:00:00 2001 From: David Schweikert Date: Mon, 6 Feb 2017 09:07:19 +0100 Subject: [PATCH] backport changes from develop --- src/fping.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/fping.c b/src/fping.c index 9de0509..c579876 100644 --- a/src/fping.c +++ b/src/fping.c @@ -37,14 +37,6 @@ extern "C" { #include "fping.h" #include "options.h" -/* if compiling for Windows, use this separate set - (too difficult to ifdef all the autoconf defines) */ -#ifdef WIN32 - -/*** Windows includes ***/ - -#else - /*** autoconf includes ***/ #include @@ -97,8 +89,6 @@ extern "C" { #include #endif /* HAVE_SYS_SELECT_H */ -#endif /* WIN32 */ - /*** externals ***/ extern char* optarg; @@ -118,7 +108,7 @@ extern int h_errno; /*** Ping packet defines ***/ #define MAX_IP_PACKET 65536 /* (theoretical) max IP packet size */ -#define SIZE_IP_HDR 20 +#define SIZE_IP_HDR 40 #ifndef IPV6 #define SIZE_ICMP_HDR ICMP_MINLEN /* from ip_icmp.h */ #else