diff options
author | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-01-08 22:29:18 +0000 |
---|---|---|
committer | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-01-08 22:29:18 +0000 |
commit | 2760e72d6826fc2215d9cf0d3bd2ae654d5138f5 (patch) | |
tree | 79438a0e5544a3df82768584a9c2e9fb366c0062 | |
parent | 3ed6d362f104e96226d1bf0f8347e670f996aa87 (diff) |
fix compilation for:
- Visual Studio .NET (2002)
- Visual Studio .NET 2003
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20349 f5534014-38df-0310-8fa8-9805f1628bb7
-rw-r--r-- | capture_wpcap_packet.c | 5 | ||||
-rw-r--r-- | config.nmake | 10 | ||||
-rw-r--r-- | gtk/capture_if_details_dlg.c | 5 |
3 files changed, 9 insertions, 11 deletions
diff --git a/capture_wpcap_packet.c b/capture_wpcap_packet.c index 901e7f1b1d..fe9438fbc4 100644 --- a/capture_wpcap_packet.c +++ b/capture_wpcap_packet.c @@ -65,12 +65,11 @@ typedef unsigned short eth_sa_family_t; /* sockaddr_storage problem with different MSVC versions * - MSVC 6 (1200) doesn't define this - * - MSVC 7 (1300) unknown + * - MSVC 7 (1300) does * - MSVC 7.1 (1310) does * - MSVC 8 (1400) does */ /* we might need to tweak this #if, see version_info for _MSC_VER values */ -/* XXX - is this more of a Platform SDK issue? */ -#if _MSC_VER < 1310 +#if _MSC_VER < 1300 struct sockaddr_storage { eth_sa_family_t __ss_family; /* address family */ /* Following fields are implementation specific */ diff --git a/config.nmake b/config.nmake index 53581aff99..d0a5ceeb4e 100644 --- a/config.nmake +++ b/config.nmake @@ -47,11 +47,11 @@ PROGRAM_FILES=C:/Program Files # Visual C++ 6.0, _MSC_VER 1200, msvcrt.dll (version 6) MSVC_VARIANT=MSVC6 -# "Microsoft Visual Studio .NET (2002)" - NOT YET WORKING +# "Microsoft Visual Studio .NET (2002)" - EXPERIMENTAL # Visual C++ 7.0, _MSC_VER 1300, msvcr70.dll #MSVC_VARIANT=MSVC2002 -# "Microsoft Visual Studio .NET 2003" - NOT YET WORKING +# "Microsoft Visual Studio .NET 2003" - EXPERIMENTAL # Visual C++ 7.1, _MSC_VER 1310, msvcr71.dll #MSVC_VARIANT=MSVC2003 @@ -404,7 +404,7 @@ MAKENSIS="$(PROGRAM_FILES)\nsis\makensis.exe" # /D_CRT_SECURE_NO_DEPRECATE don't warn for "insecure" calls, see MSDN "Security Enhancements in the CRT" # /D_CRT_NONSTDC_NO_DEPRECATE don't warn for "Deprecated CRT Functions" as MSDN calls this # -!IF "$(MSVC_VARIANT)" == "MSVC6" || "$(MSVC_VARIANT)" == "DOTNET11FRAMEWORK" || "$(MSVC_VARIANT)" == "VC2003TOOLKIT" +!IF "$(MSVC_VARIANT)" == "MSVC6" || "$(MSVC_VARIANT)" == "MSVC2002" || "$(MSVC_VARIANT)" == "MSVC2003" || "$(MSVC_VARIANT)" == "DOTNET11FRAMEWORK" || "$(MSVC_VARIANT)" == "VC2003TOOLKIT" LOCAL_CFLAGS=/Zi /W3 !ELSEIF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "DOTNET20FRAMEWORK" LOCAL_CFLAGS=/Zi /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE @@ -420,13 +420,13 @@ LOCAL_CFLAGS=/Zi /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE # !IF "$(MSVC_VARIANT)" == "MSVC6" LOCAL_LDFLAGS=/DEBUG -!ELSEIF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "VC2003TOOLKIT" || "$(MSVC_VARIANT)" == "DOTNET11FRAMEWORK" || "$(MSVC_VARIANT)" == "DOTNET20FRAMEWORK" +!ELSEIF "$(MSVC_VARIANT)" == "MSVC2002" || "$(MSVC_VARIANT)" == "MSVC2003" || "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "VC2003TOOLKIT" || "$(MSVC_VARIANT)" == "DOTNET11FRAMEWORK" || "$(MSVC_VARIANT)" == "DOTNET20FRAMEWORK" LOCAL_LDFLAGS=/DEBUG /DEFAULTLIB:msvcrt /NODEFAULTLIB:libc /NODEFAULTLIB:libcmt !ELSE !ERROR MSVC_VARIANT unknown !ENDIF -!IF "$(MSVC_VARIANT)" == "DOTNET11FRAMEWORK" +!IF "$(MSVC_VARIANT)" == "DOTNET11FRAMEWORK" || "$(MSVC_VARIANT)" == "MSVC2002" || "$(MSVC_VARIANT)" == "MSVC2003" PLUGIN_LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 !ELSE PLUGIN_LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS) diff --git a/gtk/capture_if_details_dlg.c b/gtk/capture_if_details_dlg.c index 97e7a4fcf1..32ff33a6fc 100644 --- a/gtk/capture_if_details_dlg.c +++ b/gtk/capture_if_details_dlg.c @@ -73,12 +73,11 @@ typedef unsigned short eth_sa_family_t; /* sockaddr_storage problem with different MSVC versions * - MSVC 6 (1200) doesn't define this - * - MSVC 7 (1300) unknown + * - MSVC 7 (1300) does * - MSVC 7.1 (1310) does * - MSVC 8 (1400) does */ /* we might need to tweak this #if, see version_info for _MSC_VER values */ -/* XXX - is this more of a Platform SDK issue? */ -#if _MSC_VER < 1310 +#if _MSC_VER < 1300 struct sockaddr_storage { eth_sa_family_t __ss_family; /* address family */ /* Following fields are implementation specific */ |