diff options
| -rw-r--r-- | Makefile.nmake | 3 | ||||
| -rw-r--r-- | capture-pcap-util.c | 5 | ||||
| -rw-r--r-- | capture-wpcap.c | 7 | ||||
| -rw-r--r-- | capture_ui_utils.c | 1 | ||||
| -rw-r--r-- | config.h.win32 | 5 | ||||
| -rw-r--r-- | config.nmake | 16 | ||||
| -rw-r--r-- | version_info.c | 1 | ||||
| -rw-r--r-- | wiretap/libpcap.c | 8 |
8 files changed, 36 insertions, 10 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 6b972c3070..4f38e2bfcf 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -856,6 +856,9 @@ install-files2: install-common-files: set copycmd=/y +!IF "$(MSVC_VARIANT)" == "MSVC2008EE" + xcopy "$(MSVCR_DLL)" $(INSTALL_DIR) +!ENDIF if not exist $(INSTALL_DIR) mkdir $(INSTALL_DIR) !IFDEF ENABLE_LIBWIRESHARK xcopy epan\libwireshark.dll $(INSTALL_DIR) /d diff --git a/capture-pcap-util.c b/capture-pcap-util.c index a9c60ea5ad..1c24afd485 100644 --- a/capture-pcap-util.c +++ b/capture-pcap-util.c @@ -28,14 +28,15 @@ #ifdef HAVE_LIBPCAP -#include <pcap.h> - #include <glib.h> #include <stdlib.h> +#include <stdio.h> #include <limits.h> #include <string.h> +#include <pcap.h> + #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> #endif diff --git a/capture-wpcap.c b/capture-wpcap.c index f7667f2574..81d06abecb 100644 --- a/capture-wpcap.c +++ b/capture-wpcap.c @@ -28,13 +28,14 @@ # include "config.h" #endif +#include <stdio.h> +#include <glib.h> +#include <gmodule.h> + #ifdef HAVE_LIBPCAP #include <pcap.h> #endif -#include <glib.h> -#include <gmodule.h> - #include "capture-pcap-util.h" #include "capture-pcap-util-int.h" diff --git a/capture_ui_utils.c b/capture_ui_utils.c index 29cc38e7fb..1d4b523dc6 100644 --- a/capture_ui_utils.c +++ b/capture_ui_utils.c @@ -28,6 +28,7 @@ #ifdef HAVE_LIBPCAP +#include <stdio.h> #include <string.h> #include <glib.h> diff --git a/config.h.win32 b/config.h.win32 index 6fad39a462..617ada715e 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -233,6 +233,11 @@ #define HAVE_DIRECT_H 1 #define NEED_INET_ATON_H 1 #define NEED_INET_V6DEFS_H 1 +/* Visual C 9 (2008) now needs these prototypes */ +#if _MSC_VER == 1500 +#define NTDDI_VERSION NTDDI_WIN2K +#define _WIN32_WINNT _WIN32_WINNT_WIN2K +#endif #define NEED_GETOPT_H 1 #define NEED_STRPTIME_H 1 #define strcasecmp stricmp diff --git a/config.nmake b/config.nmake index 9122fc40cc..9dae3f36d8 100644 --- a/config.nmake +++ b/config.nmake @@ -80,6 +80,14 @@ MSVC_VARIANT=MSVC6 # Visual C++ 8.0, _MSC_VER 1400, msvcr80.dll #MSVC_VARIANT=DOTNET20 +# "Microsoft Visual C++ 2008 Express Edition" +# needs additional Platform SDK installation? +# Visual C++ 9.0, _MSC_VER 1500, msvcr90.dll +# With this variant, Wireshark will compile but fails to run! +# +# THIS VARIANT CURRENTLY WON'T WORK - YOU HAVE BEEN WARNED! +#MSVC_VARIANT=MSVC2008EE + # # Optional: To compile some time critical code from assembler instead of C # @@ -92,6 +100,7 @@ MSVC_VARIANT=MSVC6 #NASM=c:\progs\nasm\nasm.exe + ##### Libraries ##### # @@ -408,7 +417,7 @@ UPX=$(WIRESHARK_LIBS)\upx301w\upx.exe # !IF "$(MSVC_VARIANT)" == "MSVC6" || "$(MSVC_VARIANT)" == "MSVC2002" || "$(MSVC_VARIANT)" == "DOTNET10" || "$(MSVC_VARIANT)" == "MSVC2003" || "$(MSVC_VARIANT)" == "DOTNET11" LOCAL_CFLAGS=/Zi /W3 /MD -!ELSEIF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" +!ELSEIF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" || "$(MSVC_VARIANT)" == "MSVC2008EE" LOCAL_CFLAGS=/Zi /W3 /MD /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE !ELSE !ERROR MSVC_VARIANT unknown @@ -488,6 +497,9 @@ VCREDIST_EXE=$(WIRESHARK_LIBS)\vcredist_x86.exe # and copy it to the lib folder!!! VCREDIST_EXE=$(WIRESHARK_LIBS)\vcredist_x86.exe +!ELSEIF "$(MSVC_VARIANT)" == "MSVC2008EE" +MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\*.* + !ELSE !ERROR MSVC_VARIANT unknown !ENDIF @@ -829,6 +841,8 @@ MSC_VER_REQUIRED=1300 MSC_VER_REQUIRED=1310 !ELSEIF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" MSC_VER_REQUIRED=1400 +!ELSEIF "$(MSVC_VARIANT)" == "MSVC2008EE" +MSC_VER_REQUIRED=1500 !ELSE !ERROR MSVC_VARIANT unknown !ENDIF diff --git a/version_info.c b/version_info.c index cd6a65070d..7b326e7960 100644 --- a/version_info.c +++ b/version_info.c @@ -29,6 +29,7 @@ #include <glib.h> #include <stdlib.h> +#include <stdio.h> #include <string.h> #include <errno.h> diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index 7d502c98e8..ace86d1d78 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -24,10 +24,6 @@ #include "config.h" #endif -#ifdef HAVE_PCAP_H -#include <pcap.h> -#endif - #include <stdlib.h> #include <string.h> #include <errno.h> @@ -39,6 +35,10 @@ #include "libpcap.h" #ifdef HAVE_PCAP_H +#include <pcap.h> +#endif + +#ifdef HAVE_PCAP_H # ifdef HAVE_SYS_TYPES_H # include <sys/types.h> # endif |