diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2011-08-01 12:38:58 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2011-08-01 12:38:58 +0000 |
| commit | ffd28912d30cce61139d629ac64fc6efe325307a (patch) | |
| tree | 9ce019c9c027e494c683c0e7319cb0a3cbbbaf19 | |
| parent | 391a3ebe363930c9ae5556f9ade8ae762c3bd564 (diff) | |
Another fix for building with MSVC2005.
The previous fixes in r37728 and r37730 did build a wireshark which was
unable to use the native windows file dialog (GetOpenFileName).
svn path=/trunk/; revision=38299
| -rw-r--r-- | config.h.win32 | 3 | ||||
| -rw-r--r-- | epan/except.c | 4 | ||||
| -rw-r--r-- | gtk/main.c | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/config.h.win32 b/config.h.win32 index e526884d83..d95ac8c7b1 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -238,9 +238,6 @@ #if _MSC_VER == 1500 || _MSC_VER == 1600 #define NTDDI_VERSION NTDDI_WIN2K #define _WIN32_WINNT _WIN32_WINNT_WIN2K -#else -/* IsDebuggerPresent() and AttachConsole() needs this #define! */ -#define _WIN32_WINNT 0x0500 #endif #define strncasecmp strnicmp diff --git a/epan/except.c b/epan/except.c index dc935eeb2b..8930c96dc9 100644 --- a/epan/except.c +++ b/epan/except.c @@ -41,6 +41,10 @@ #include "except.h" #ifdef _WIN32 +#if _MSC_VER < 1500 +/* IsDebuggerPresent() needs this #define! */ +#define _WIN32_WINNT 0x0400 +#endif #include <windows.h> #include "exceptions.h" #endif diff --git a/gtk/main.c b/gtk/main.c index 3934745866..3a897ef345 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -52,6 +52,10 @@ #endif #ifdef _WIN32 /* Needed for console I/O */ +#if _MSC_VER < 1500 +/* AttachConsole() needs this #define! */ +#define _WIN32_WINNT 0x0501 +#endif #include <fcntl.h> #include <conio.h> #endif |