X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/05bf9bfc237231a3d10e8f160a9037efdcec70f3..d6bfd142e9c106deaf9c0091f8b5d0d89a0674ff:/tcpdump-stdinc.h

diff --git a/tcpdump-stdinc.h b/tcpdump-stdinc.h
index 1e5fc3a9..eb6c9428 100644
--- a/tcpdump-stdinc.h
+++ b/tcpdump-stdinc.h
@@ -69,8 +69,6 @@
 #define read _read
 #define close _close
 #define O_RDONLY _O_RDONLY
-
-typedef short ino_t;
 #endif /* __MINGW32__ */
 
 #ifdef __MINGW32__
@@ -173,7 +171,11 @@ 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(_MSC_VER) && defined(UNALIGNED)
+/* MSVC may have its own macro defined with the same name and purpose. */
+#else
 #define UNALIGNED	__attribute__((packed))
+#endif
 
 #if defined(WIN32) || defined(MSDOS)
   #define FOPEN_READ_TXT   "rt"