diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-25 04:28:31 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-25 04:28:31 +0000 |
| commit | 9af1b2e05f32656efb130eff341ecb011a81e08c (patch) | |
| tree | 5b39444cedbed2b5d5ae51a86e31282a245b5859 /crypto/third_party/nss/sha512.cc | |
| parent | 7d0c2e9c4ca32baa00cca2748442fbc840d88acb (diff) | |
| download | chromium_src-9af1b2e05f32656efb130eff341ecb011a81e08c.zip chromium_src-9af1b2e05f32656efb130eff341ecb011a81e08c.tar.gz chromium_src-9af1b2e05f32656efb130eff341ecb011a81e08c.tar.bz2 | |
Remove prtypes.h and prcpucfg*.h from base/third_party/nspr.
Copy the type and macro definitions we need to base/third_party/nspr/prtime.h.
Add chromium-prtypes.h to crypto/third_party/nss.
content/common/plugin_list_posix.cc doesn't need to include prcpucfg_linux.h.
R=ananta@chromium.org,mark@chromium.org,rsleevi@chromium.org
Review URL: https://codereview.chromium.org/209343003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259148 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/third_party/nss/sha512.cc')
| -rw-r--r-- | crypto/third_party/nss/sha512.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/third_party/nss/sha512.cc b/crypto/third_party/nss/sha512.cc index 976a604..5ef4e50 100644 --- a/crypto/third_party/nss/sha512.cc +++ b/crypto/third_party/nss/sha512.cc @@ -42,7 +42,7 @@ // size from ~10k to ~1k. The performance should be reasonable for our use. #define NOUNROLL256 1 -#include "base/third_party/nspr/prtypes.h" /* for PRUintXX */ +#include "crypto/third_party/nss/chromium-prtypes.h" /* for PRUintXX */ #if defined(_X86_) || defined(SHA_NO_LONG_LONG) #define NOUNROLL512 1 #undef HAVE_LONG_LONG |