diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-01 21:24:48 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-01 21:24:48 +0000 |
commit | 398fd9a83e2d807b313680aead96edecf78616e5 (patch) | |
tree | dfccceafa18a627b6d503b34887232cd99446ba3 /net/base | |
parent | 06715623b05029e3644447d437d74c8731798d5f (diff) | |
download | chromium_src-398fd9a83e2d807b313680aead96edecf78616e5.zip chromium_src-398fd9a83e2d807b313680aead96edecf78616e5.tar.gz chromium_src-398fd9a83e2d807b313680aead96edecf78616e5.tar.bz2 |
Remove all 192 static initializers from transport_security_state.cc
This is necessary for gcc 4.4.3, see the comments on
http://codereview.chromium.org/8687014
BUG=94925
TEST=none
TBR=willchan
Review URL: http://codereview.chromium.org/8776012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112537 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
-rw-r--r-- | net/base/transport_security_state.cc | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/net/base/transport_security_state.cc b/net/base/transport_security_state.cc index 6cc2252..ce9cd43 100644 --- a/net/base/transport_security_state.cc +++ b/net/base/transport_security_state.cc @@ -923,10 +923,10 @@ static const char* const kGoogleRejectedCerts[] = { kSPKIHash_Vodafone, NULL, }; -static const PublicKeyPins kGooglePins = { - kGoogleAcceptableCerts, - kGoogleRejectedCerts, -}; +#define kGooglePins { \ + kGoogleAcceptableCerts, \ + kGoogleRejectedCerts, \ +} static const char* const kTorAcceptableCerts[] = { kSPKIHash_RapidSSL, @@ -936,10 +936,10 @@ static const char* const kTorAcceptableCerts[] = { kSPKIHash_Tor3, NULL, }; -static const PublicKeyPins kTorPins = { - kTorAcceptableCerts, - kNoRejectedPublicKeys, -}; +#define kTorPins { \ + kTorAcceptableCerts, \ + kNoRejectedPublicKeys, \ +} static const char* const kTwitterComAcceptableCerts[] = { kSPKIHash_VeriSignClass1, @@ -963,10 +963,10 @@ static const char* const kTwitterComAcceptableCerts[] = { kSPKIHash_Twitter1, NULL, }; -static const PublicKeyPins kTwitterComPins = { - kTwitterComAcceptableCerts, - kNoRejectedPublicKeys, -}; +#define kTwitterComPins { \ + kTwitterComAcceptableCerts, \ + kNoRejectedPublicKeys, \ +} // kTestAcceptableCerts doesn't actually match any public keys and is used // with "pinningtest.appspot.com", below, to test if pinning is active. @@ -974,14 +974,14 @@ static const char* const kTestAcceptableCerts[] = { "sha1/AAAAAAAAAAAAAAAAAAAAAAAAAAA=", NULL, }; -static const PublicKeyPins kTestPins = { - kTestAcceptableCerts, - kNoRejectedPublicKeys, -}; +#define kTestPins { \ + kTestAcceptableCerts, \ + kNoRejectedPublicKeys, \ +} -static const PublicKeyPins kNoPins = { - NULL, NULL, -}; +#define kNoPins { \ + NULL, NULL, \ +} #if defined(OS_CHROMEOS) static const bool kTwitterHSTS = true; |