diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-08-11 21:59:59 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-08-11 21:59:59 +0000 |
| commit | 81670aaf1103819ae2a7a334061d241db8a0e1a3 (patch) | |
| tree | fd2198e94a66d0bacb020c975412bdde6068bd7a /config.nmake | |
| parent | f0114720b773d4eeea03b65e7f8faa01d6dd6db4 (diff) | |
On Windows, if we're running anything but plain Visual C++ 6 (including
VC6 plus a platform SDK), set INET6. Use that to figure out if we need
to define socklen_t for c-ares. This should fix bug 2797.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25985 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/config.nmake b/config.nmake index b2444b78a1..10ced07268 100644 --- a/config.nmake +++ b/config.nmake @@ -843,3 +843,10 @@ PATH=$(PATH);$(CYGWIN_PATH);$(GLIB_DIR)\bin;$(GETTEXT_DIR)\bin;$(ICONV_DIR)\bin; !ELSE PATH=$(PATH);$(CYGWIN_PATH);$(GLIB_DIR)\bin;$(GETTEXT_DIR)\bin;$(ZLIB_PATH);$(ADNS_PATH) !ENDIF + +# We can't use a lot of IPv6 code with plain Visual C++ 6.0 +!IF "$(MSVC_VARIANT)" == "MSVC6" && !DEFINED(MSSDK) +INET6_CONFIG= +!ELSE +INET6_CONFIG=^#define INET6 1 +!ENDIF |