]> The Tcpdump Group git mirrors - libpcap/commitdiff
Fixed a conditional typedef that caused wpcap.dll not to compile with VC.
authorrisso <risso>
Tue, 6 Apr 2004 13:30:22 +0000 (13:30 +0000)
committerrisso <risso>
Tue, 6 Apr 2004 13:30:22 +0000 (13:30 +0000)
Win32/Include/ip6_misc.h

index 4543567f5ca945af3d51e118d5042b7d115eac34..ae115f25d01a4a31de590d95044c0a308be52e29 100644 (file)
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @(#) $Header: /tcpdump/master/libpcap/Win32/Include/ip6_misc.h,v 1.2 2002-08-02 13:59:03 risso Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/libpcap/Win32/Include/ip6_misc.h,v 1.3 2004-04-06 13:30:22 risso Exp $ (LBL)
  */
 
 /*
@@ -58,8 +58,12 @@ struct in6_addr
 #endif /* __MINGW32__ */
 
 
-#ifdef __MINGW32__
+#if (defined WIN32) || (defined __MINGW32__)
 typedef unsigned short sa_family_t;
+#endif
+
+
+#ifdef __MINGW32__
 
 #define        __SOCKADDR_COMMON(sa_prefix) \
   sa_family_t sa_prefix##family