diff options
| author | Gerald Combs <gerald@wireshark.org> | 2008-08-11 21:59:59 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2008-08-11 21:59:59 +0000 |
| commit | 5906f69b880d1959763d10490da91bc2ae2b3fb7 (patch) | |
| tree | fd2198e94a66d0bacb020c975412bdde6068bd7a /config.nmake | |
| parent | 8e032dbc8790734420c2a94fc0863521944ae06b (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.
svn path=/trunk/; revision=25985
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 |