diff options
| -rw-r--r-- | pcap-types.h | 8 | ||||
| -rwxr-xr-x | rpcapd/win32-svc.c | 1 | ||||
| -rw-r--r-- | sockutils.h | 8 |
3 files changed, 0 insertions, 17 deletions
diff --git a/pcap-types.h b/pcap-types.h index f075d4b7..9614f9f1 100644 --- a/pcap-types.h +++ b/pcap-types.h @@ -35,14 +35,6 @@ * Get u_int defined, by hook or by crook. */ #ifdef _WIN32 - /* - * Avoids a compiler warning in case this was already defined - * (someone defined _WINSOCKAPI_ when including 'windows.h', in order - * to prevent it from including 'winsock.h') - */ - #ifdef _WINSOCKAPI_ - #undef _WINSOCKAPI_ - #endif /* * This defines u_int. diff --git a/rpcapd/win32-svc.c b/rpcapd/win32-svc.c index 08468610..20c57a35 100755 --- a/rpcapd/win32-svc.c +++ b/rpcapd/win32-svc.c @@ -33,7 +33,6 @@ #include "rpcapd.h" #include <signal.h> -#define _WINSOCKAPI_ #include "windows.h" #include <pcap.h> // for PCAP_ERRBUF_SIZE #include "sockutils.h" // for SOCK_ASSERT diff --git a/sockutils.h b/sockutils.h index 13b6d6d9..6cd85bd8 100644 --- a/sockutils.h +++ b/sockutils.h @@ -38,14 +38,6 @@ #endif #ifdef _WIN32 - /* Windows */ - /* - * Prevents a compiler warning in case this was already defined (to - * avoid that windows.h includes winsock.h) - */ - #ifdef _WINSOCKAPI_ - #undef _WINSOCKAPI_ - #endif /* Need windef.h for defines used in winsock2.h under MingW32 */ #ifdef __MINGW32__ #include <windef.h> |