diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-12-07 23:58:46 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-12-07 23:58:46 +0000 |
| commit | 539e4a3a46ec5207696fa1ec6462ef4d0ac7c5e1 (patch) | |
| tree | 7901804d8412c5b0248e742c48f65a09151e5c39 /config.h.win32 | |
| parent | d55c25389a8d354802bfe6e0080fefce089ddc5e (diff) | |
Delete the *right* config.h.win32.
Copy the MSVC++-version-checking stuff from it into the top-level
config.h.win32, and try to set up config.nmake so that MSC_VER_REQUIRED
is defined in all Makefiles that include config.nmake.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23802 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'config.h.win32')
| -rw-r--r-- | config.h.win32 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/config.h.win32 b/config.h.win32 index 1e4e1e583f..fe6b66c66e 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -264,3 +264,11 @@ /* We shouldn't need this under Windows but we'll define it anyway. */ #define HTML_VIEWER "mozilla" + +/* Check for the required _MSC_VER */ +#if MSC_VER_REQUIRED != _MSC_VER +#define WS_TO_STRING2(x) #x +#define WS_TO_STRING(x) WS_TO_STRING2(x) +#pragma message( "_MSC_VER is:" WS_TO_STRING(_MSC_VER) " but required is:" WS_TO_STRING(MSC_VER_REQUIRED) ) +#error Your MSVC_VARIANT setting in config.nmake doesn't match the MS compiler version! +#endif |