diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2007-01-29 22:40:52 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2007-01-29 22:40:52 +0000 |
| commit | 3aec86adcb9054021fbc14fc3dea6dea74cb669d (patch) | |
| tree | 2d23b81b427d682d22aeb14217de7e1566312ae1 /config.h.win32 | |
| parent | 7e4b82a4001412521efd0b72d42111a56b7e7fd2 (diff) | |
| download | wireshark-3aec86adcb9054021fbc14fc3dea6dea74cb669d.tar.gz wireshark-3aec86adcb9054021fbc14fc3dea6dea74cb669d.tar.bz2 wireshark-3aec86adcb9054021fbc14fc3dea6dea74cb669d.zip | |
fix compiler version detection logic, sorry for the noise!
svn path=/trunk/; revision=20614
Diffstat (limited to 'config.h.win32')
| -rw-r--r-- | config.h.win32 | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/config.h.win32 b/config.h.win32 index d956a112bd..1bc5ab3e8e 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -256,14 +256,12 @@ /* 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) +#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) +#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) +#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) +#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! #endif -*/ |