]> The Tcpdump Group git mirrors - tcpdump/commitdiff
Get rid of some unneeded #defines and #includes.
authorGisle Vanem <[email protected]>
Mon, 14 Sep 2015 19:07:44 +0000 (12:07 -0700)
committerGuy Harris <[email protected]>
Mon, 14 Sep 2015 19:07:44 +0000 (12:07 -0700)
Those lines are not needed since "netdissect-stdinc.h" has:

#include <winsock2.h>
#include <ws2tcpip.h>

This will ensure <winsock.h> is not included in a later <windows.h>.

SIZE_BUF is not used anywhere AFAICS.

tcpdump.c

index 58d38a284840fd34fe3262d5b850ce265ebc03a4..4cf7484967a34c614f55b418b45ad72abd533954 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -57,12 +57,6 @@ The Regents of the University of California.  All rights reserved.\n";
 #include <netdissect-stdinc.h>
 
 #ifdef _WIN32
 #include <netdissect-stdinc.h>
 
 #ifdef _WIN32
-#ifndef _WINSOCKAPI_
-#define _WINSOCKAPI_ /* Prevent inclusion of winsock.h in windows.h */
-#endif /* _WINSOCKAPI_ */
-#include <windows.h>
-#include <winsock2.h>
-extern int SIZE_BUF;
 #define off_t long
 #define uint UINT
 #endif /* _WIN32 */
 #define off_t long
 #define uint UINT
 #endif /* _WIN32 */