diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2007-01-31 02:23:06 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2007-01-31 02:23:06 +0000 |
| commit | 5698c994ca78ec69d6a66bc2183994d6952dd3b8 (patch) | |
| tree | 04289b1bbdfd4b07cccfe3a7495b1e61025e7546 /config.h.win32 | |
| parent | e166f9c4e6a41db1d2138b7908134107cb8ba726 (diff) | |
| download | wireshark-5698c994ca78ec69d6a66bc2183994d6952dd3b8.tar.gz wireshark-5698c994ca78ec69d6a66bc2183994d6952dd3b8.tar.bz2 wireshark-5698c994ca78ec69d6a66bc2183994d6952dd3b8.zip | |
C preprocessor only handles integers for conditional compilation. Build MSC_VER_REQUIRED in config.nmake and compare it with _MSC_VER in config.h.win32
svn path=/trunk/; revision=20637
Diffstat (limited to 'config.h.win32')
| -rw-r--r-- | config.h.win32 | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/config.h.win32 b/config.h.win32 index 1bc5ab3e8e..4d5d605262 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -254,14 +254,10 @@ /* We shouldn't need this under Windows but we'll define it anyway. */ #define HTML_VIEWER "mozilla" -/* check if the MSVC_VARIANT setting in config.nmake and the current MSVC compiler version matches together */ -/* user might forget to set this or the PATH to the C compiler could be wrong */ -#if _MSC_VER == 1400 && (MSVC_VARIANT != MSVC2005EE || MSVC_VARIANT != MSVC2005 || MSVC_VARIANT != DOTNET20 || MSVC_VARIANT != DOTNET30) -#error Your MSVC_VARIANT setting in config.nmake and the C compiler version 14.00 (V8.0) don't match! -#elseif _MSC_VER == 1310 && (MSVC_VARIANT != MSVC2003 || MSVC_VARIANT != DOTNET11) -#error Your MSVC_VARIANT setting in config.nmake and the C compiler version 13.10 (V7.1) don't match! -#elseif _MSC_VER == 1300 && (MSVC_VARIANT != MSVC2002 || MSVC_VARIANT != DOTNET10) -#error Your MSVC_VARIANT setting in config.nmake and the C compiler version 13.00 (V7.0) don't match! -#elseif _MSC_VER == 1200 && (MSVC_VARIANT != MSVC6) -#error Your MSVC_VARIANT setting in config.nmake and the C compiler version 12.00 (V6.0) don't match! +/* 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 |