diff options
| author | yurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-13 08:19:28 +0000 |
|---|---|---|
| committer | yurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-13 08:19:28 +0000 |
| commit | 699d6248ec0121a5513378ec4875492d9f91ca97 (patch) | |
| tree | 5fc1173f7b378784f387b9778211af453c71bf9d /net | |
| parent | 785df74a997943076bbb68bf7dc8fba9f4347e44 (diff) | |
| download | chromium_src-699d6248ec0121a5513378ec4875492d9f91ca97.zip chromium_src-699d6248ec0121a5513378ec4875492d9f91ca97.tar.gz chromium_src-699d6248ec0121a5513378ec4875492d9f91ca97.tar.bz2 | |
Revert "Add COMPONENT_BUILD global define. "
The change broke compilation on Linux Builder (dbg)(shared):
http://build.chromium.org/p/chromium/builders/Linux%20Builder%20%28dbg%29%28shared%29/builds/3365/steps/compile/logs/stdio
TBR=darin
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/7352014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92329 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/net_api.h | 4 | ||||
| -rw-r--r-- | net/base/ssl_false_start_blacklist.h | 4 | ||||
| -rw-r--r-- | net/net.gyp | 19 |
3 files changed, 23 insertions, 4 deletions
diff --git a/net/base/net_api.h b/net/base/net_api.h index 4b017fd..610e974 100644 --- a/net/base/net_api.h +++ b/net/base/net_api.h @@ -10,7 +10,7 @@ // exported to consumers, and NET_TEST that allows unit tests to access features // not intended to be used directly by real consumers. -#if defined(COMPONENT_BUILD) +#if defined(NET_DLL) #if defined(WIN32) #if defined(NET_IMPLEMENTATION) @@ -26,7 +26,7 @@ #define NET_TEST __attribute__((visibility("default"))) #endif -#else /// defined(COMPONENT_BUILD) +#else /// defined(NET_DLL) #define NET_API #define NET_TEST #endif diff --git a/net/base/ssl_false_start_blacklist.h b/net/base/ssl_false_start_blacklist.h index 1759630..5222822 100644 --- a/net/base/ssl_false_start_blacklist.h +++ b/net/base/ssl_false_start_blacklist.h @@ -14,11 +14,11 @@ namespace net { // to TLS False Start. Because this set is several hundred long, it's // precompiled by the code in ssl_false_start_blacklist_process.cc into a hash // table for fast lookups. -class SSLFalseStartBlacklist { +class NET_TEST SSLFalseStartBlacklist { public: // IsMember returns true if the given host is in the blacklist. // host: a DNS name in dotted form (i.e. "www.example.com") - NET_TEST static bool IsMember(const char* host); + static bool IsMember(const char* host); // Hash returns the modified djb2 hash of the given string. static unsigned Hash(const char* str) { diff --git a/net/net.gyp b/net/net.gyp index 31afc17..1eb0a8d 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -822,8 +822,27 @@ ], [ 'component == "shared_library"', { 'defines': [ + 'NET_DLL', 'NET_IMPLEMENTATION', ], + 'direct_dependent_settings': { + 'defines': [ + 'NET_DLL', + ], + }, + 'conditions': [ + [ 'OS == "win"', { + 'msvs_disabled_warnings': [ + # class 'std::xx' needs to have dll-interface. + 4251, + ], + 'direct_dependent_settings': { + 'msvs_disabled_warnings': [ + 4251, + ], + }, + }], + ], }], [ 'OS == "mac"', { 'dependencies': [ |