diff options
| author | Gerald Combs <gerald@wireshark.org> | 2009-04-01 00:30:45 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2009-04-01 00:30:45 +0000 |
| commit | 9c5ca83acf3aea0aa7108f08efeb1f6c7e3866af (patch) | |
| tree | 4e0baa5289d1e041817822fa185540681433f99a /epan/addr_resolv.c | |
| parent | 4400c3393e7016d387591d16f4472ad5a62f876b (diff) | |
| download | wireshark-9c5ca83acf3aea0aa7108f08efeb1f6c7e3866af.tar.gz | |
Only #undef inet_aton if we're using ADNS on Windows.
svn path=/trunk/; revision=27920
Diffstat (limited to 'epan/addr_resolv.c')
| -rw-r--r-- | epan/addr_resolv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index ea32c6f2ba..767ef65a52 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -115,7 +115,7 @@ # ifdef HAVE_GNU_ADNS # include <errno.h> # include <adns.h> -# ifdef inet_aton +# if defined(inet_aton) && defined(_WIN32) # undef inet_aton # endif # endif /* HAVE_GNU_ADNS */ |