diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-19 18:44:58 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-19 18:44:58 +0000 |
| commit | 6d603aab761645693dbf88cfe12c1964c7920ad2 (patch) | |
| tree | 4e2494978df12617d574fef7930f80582aa22463 /net/net.gyp | |
| parent | 3a38fe9996db9d25c0c44ee68afdb2620c50b6b1 (diff) | |
| download | chromium_src-6d603aab761645693dbf88cfe12c1964c7920ad2.zip chromium_src-6d603aab761645693dbf88cfe12c1964c7920ad2.tar.gz chromium_src-6d603aab761645693dbf88cfe12c1964c7920ad2.tar.bz2 | |
Re-lands r39417: "Implement NetworkChangeNotifierLinux."
The change broke certain linux buildbots due to netlink.h forward declaring struct net, which conflicts with the net namespace. The fix is to move the netlink code into a separate file which is not in the net namespace.
Review URL: http://codereview.chromium.org/650009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39465 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rwxr-xr-x | net/net.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/net.gyp b/net/net.gyp index 599f683..4509616 100755 --- a/net/net.gyp +++ b/net/net.gyp @@ -113,6 +113,8 @@ 'base/network_change_notifier_linux.h', 'base/network_change_notifier_mac.cc', 'base/network_change_notifier_mac.h', + 'base/network_change_notifier_netlink_linux.cc', + 'base/network_change_notifier_netlink_linux.h', 'base/network_change_notifier_win.cc', 'base/network_change_notifier_win.h', 'base/nss_memio.c', |