diff --git a/mswin32/nmap.vcxproj b/mswin32/nmap.vcxproj index b65654071..97a72183e 100644 --- a/mswin32/nmap.vcxproj +++ b/mswin32/nmap.vcxproj @@ -52,7 +52,7 @@ Disabled - .;..;..\liblua;..\nbase;..\libpcre;winip;..\nsock\include;pcap-include;..\libdnet-stripped\include;OpenSSL\include;..\liblinear;%(AdditionalIncludeDirectories) + .;..;..\liblua;..\nbase;..\libpcre;..\nsock\include;pcap-include;..\libdnet-stripped\include;OpenSSL\include;..\liblinear;%(AdditionalIncludeDirectories) WIN32;_CONSOLE;%(PreprocessorDefinitions) false false @@ -98,7 +98,7 @@ MaxSpeed OnlyExplicitInline - .;..;..\liblua;..\nbase;..\libpcre;winip;..\nsock\include;pcap-include;..\libdnet-stripped\include;OpenSSL\include;..\liblinear;%(AdditionalIncludeDirectories) + .;..;..\liblua;..\nbase;..\libpcre;..\nsock\include;pcap-include;..\libdnet-stripped\include;OpenSSL\include;..\liblinear;%(AdditionalIncludeDirectories) WIN32;_CONSOLE;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/mswin32/winfix.cc b/mswin32/winfix.cc index bbcfeb0c8..2140954ee 100644 --- a/mswin32/winfix.cc +++ b/mswin32/winfix.cc @@ -251,7 +251,7 @@ void win_init() ULONG len = sizeof(pcaplist); o.have_pcap = true; - if(o.debugging > 2) printf("***WinIP*** trying to initialize WinPcap\n"); + if(o.debugging > 2) printf("Trying to initialize WinPcap\n"); PacketGetAdapterNames(pcaplist, &len); #ifdef _MSC_VER diff --git a/nping/nping.vcxproj b/nping/nping.vcxproj index da3e84828..0ba59aec5 100644 --- a/nping/nping.vcxproj +++ b/nping/nping.vcxproj @@ -54,7 +54,7 @@ Disabled - .;..;..\mswin32;../nbase;winip;..\nsock\include;..\mswin32\pcap-include;..\libdnet-stripped\include;..\mswin32\OpenSSL\include;%(AdditionalIncludeDirectories) + .;..;..\mswin32;../nbase;..\nsock\include;..\mswin32\pcap-include;..\libdnet-stripped\include;..\mswin32\OpenSSL\include;%(AdditionalIncludeDirectories) WIN32;_CONSOLE;%(PreprocessorDefinitions) false false @@ -100,7 +100,7 @@ MaxSpeed OnlyExplicitInline - .;..;..\mswin32;../nbase;winip;..\nsock\include;..\mswin32\pcap-include;..\libdnet-stripped\include;..\mswin32\OpenSSL\include;%(AdditionalIncludeDirectories) + .;..;..\mswin32;../nbase;..\nsock\include;..\mswin32\pcap-include;..\libdnet-stripped\include;..\mswin32\OpenSSL\include;%(AdditionalIncludeDirectories) WIN32;_CONSOLE;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/nping/winfix.cc b/nping/winfix.cc index e74f97178..3f23fa403 100644 --- a/nping/winfix.cc +++ b/nping/winfix.cc @@ -250,7 +250,7 @@ void win_init() { ULONG len = sizeof(pcaplist); - if(o.getDebugging() >= DBG_2) printf("***WinIP*** trying to initialize WinPcap\n"); + if(o.getDebugging() >= DBG_2) printf("Trying to initialize WinPcap\n"); PacketGetAdapterNames(pcaplist, &len); #ifdef _MSC_VER diff --git a/tcpip.h b/tcpip.h index f40ed175f..31efdda0a 100644 --- a/tcpip.h +++ b/tcpip.h @@ -536,9 +536,7 @@ void broadcast_socket(int sd); int recvtime(int sd, char *buf, int len, int seconds, int *timedout); /* Sets a pcap filter function -- makes SOCK_RAW reads easier */ -#ifndef WINIP_H void set_pcap_filter(const char *device, pcap_t *pd, const char *bpf, ...); -#endif #endif /*TCPIP_H*/