Some changes req'd to build Wireshark with VS 2010 (VC10). [More changes still needed].

svn path=/trunk/; revision=32468
This commit is contained in:
Bill Meier 2010-04-14 21:56:00 +00:00
parent 67b7737481
commit 808a95b14e
3 changed files with 6 additions and 2 deletions

View File

@ -217,8 +217,8 @@
#define WIN32 1
#endif
/* Visual C 9 (2008) now needs these prototypes */
#if _MSC_VER == 1500
/* Visual C 9 (2008) & Visual C 10 (2010) need these prototypes */
#if _MSC_VER == 1500 || _MSC_VER == 1600
#define NTDDI_VERSION NTDDI_WIN2K
#define _WIN32_WINNT _WIN32_WINNT_WIN2K
#endif

View File

@ -36,8 +36,10 @@
#ifdef HAVE_WINSOCK2_H
#include <winsock2.h> /* needed to define AF_ values on Windows */
#if _MSC_VER < 1600 /* VC10 (and presumably future VC versions will) have this definition */
#define EAFNOSUPPORT WSAEAFNOSUPPORT
#endif
#endif
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>

View File

@ -35,8 +35,10 @@
#ifdef HAVE_WINSOCK2_H
#include <winsock2.h> /* needed to define AF_ values on Windows */
#if _MSC_VER < 1600 /* VC10 (and presumably future VC versions will) have this definition */
#define EAFNOSUPPORT WSAEAFNOSUPPORT
#endif
#endif
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>