X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/7f7892a596d48ac8ba364029032d535d56f8a315..b226ebedc9f7762b07029d77bd3b4a107ae1c087:/tcpdump-stdinc.h

diff --git a/tcpdump-stdinc.h b/tcpdump-stdinc.h
index 1fe7194f..54abaf5f 100644
--- a/tcpdump-stdinc.h
+++ b/tcpdump-stdinc.h
@@ -39,7 +39,9 @@
 #ifndef tcpdump_stdinc_h
 #define tcpdump_stdinc_h
 
-#ifdef WIN32
+#include <errno.h>
+
+#ifdef _WIN32
 
 #include <stdint.h>
 #include <stdio.h>
@@ -49,15 +51,10 @@
 #include <ctype.h>
 #include <time.h>
 #include <io.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <net/netdb.h>  /* in wpcap's Win32/include */
 
-#ifndef NBBY
-#define NBBY	8
-#endif
-
 #ifndef uint8_t
 #define uint8_t		unsigned char
 #endif
@@ -179,7 +176,7 @@ typedef char* caddr_t;
 #define vsnprintf _vsnprintf
 #define RETSIGTYPE void
 
-#else /* WIN32 */
+#else /* _WIN32 */
 
 #include <ctype.h>
 #include <unistd.h>
@@ -201,7 +198,7 @@ typedef char* caddr_t;
 
 #include <arpa/inet.h>
 
-#endif /* WIN32 */
+#endif /* _WIN32 */
 
 #ifndef HAVE___ATTRIBUTE__
 #define __attribute__(x)
@@ -238,14 +235,13 @@ typedef char* caddr_t;
  * Note: this also requires that padding be put into the structure,
  * at least for compilers where it's implemented as __attribute__((packed)).
  */
-#if defined(__GNUC__)
+#if !(defined(_MSC_VER) && defined(UNALIGNED))
+/* MSVC may have its own macro defined with the same name and purpose. */
 #undef UNALIGNED
 #define UNALIGNED	__attribute__((packed))
-#else
- /* MSVC may have its own macro defined with the same name and purpose. */
 #endif
 
-#if defined(WIN32) || defined(MSDOS)
+#if defined(_WIN32) || defined(MSDOS)
   #define FOPEN_READ_TXT   "rt"
   #define FOPEN_READ_BIN   "rb"
   #define FOPEN_WRITE_TXT  "wt"