diff options
| author | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-06 20:35:17 +0000 |
|---|---|---|
| committer | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-06 20:35:17 +0000 |
| commit | c9046afea46a4b8252392adced73f3d2a9fb354e (patch) | |
| tree | c557a80884a379eecf170e3cf88acee77bc4d837 /base/third_party/nss | |
| parent | a4930c88e7fb14ba66340cbe393fcdf4c668e41c (diff) | |
| download | chromium_src-c9046afea46a4b8252392adced73f3d2a9fb354e.zip chromium_src-c9046afea46a4b8252392adced73f3d2a9fb354e.tar.gz chromium_src-c9046afea46a4b8252392adced73f3d2a9fb354e.tar.bz2 | |
Fix base::DIR_SOURCE_ROOT path calculation.
Add missing header files to base.vcproj.
Fix thread local storage implicit destructor call on Windows x64.
Fix build compilation issues in x64 with third party headers.
Fix Pickle for x64, the header doesn't need to be size_t, uint32 ought to be sufficient for the object.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@450 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/third_party/nss')
| -rw-r--r-- | base/third_party/nss/sha512.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/base/third_party/nss/sha512.cc b/base/third_party/nss/sha512.cc index d17f532c..5a02f46 100644 --- a/base/third_party/nss/sha512.cc +++ b/base/third_party/nss/sha512.cc @@ -42,16 +42,11 @@ // size from ~10k to ~1k. The performance should be reasonable for our use. #define NOUNROLL256 1 -#if defined(_M_IX86) || defined(i386) || defined(__i386) || defined(__i386__) -#define _X86_ 1 -#endif - -#include "base/third_party/nspr/prcpucfg.h" +#include "base/third_party/nspr/prtypes.h" /* for PRUintXX */ #if defined(_X86_) || defined(SHA_NO_LONG_LONG) #define NOUNROLL512 1 #undef HAVE_LONG_LONG #endif -#include "base/third_party/nspr/prtypes.h" /* for PRUintXX */ #include "base/third_party/nss/blapi.h" #include "base/third_party/nss/sha256.h" /* for struct SHA256ContextStr */ |