diff options
| author | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-06 03:09:14 +0000 |
|---|---|---|
| committer | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-06 03:09:14 +0000 |
| commit | e7b055b2192125a85b07bcacca312d01357f9e96 (patch) | |
| tree | dc063e0aeb7284195ad7dd6b05f821ff20903740 /net/base/address_list.cc | |
| parent | 3fff63770514e0c178ee531308d4c3ae675b2bee (diff) | |
| download | chromium_src-e7b055b2192125a85b07bcacca312d01357f9e96.zip chromium_src-e7b055b2192125a85b07bcacca312d01357f9e96.tar.gz chromium_src-e7b055b2192125a85b07bcacca312d01357f9e96.tar.bz2 | |
Merge some changes in net/base from branches/mac_july_2008 to trunk.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@420 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/address_list.cc')
| -rw-r--r-- | net/base/address_list.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/base/address_list.cc b/net/base/address_list.cc index f365fb6..6ba6450 100644 --- a/net/base/address_list.cc +++ b/net/base/address_list.cc @@ -29,8 +29,12 @@ #include "net/base/address_list.h" +#ifdef OS_WIN #include <ws2tcpip.h> #include <wspiapi.h> // Needed for Win2k compat. +#else +#include <netdb.h> +#endif namespace net { |