diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-15 01:36:45 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-15 01:36:45 +0000 |
| commit | e3ff8ee22b683f1b7753a2246265e393e9b0ad44 (patch) | |
| tree | 6b2721d7c488e63b4311d5cc4d610d19afabda1f /crypto/third_party | |
| parent | 8178dddb833bfdf62ba646d50a3eb62f05b68783 (diff) | |
| download | chromium_src-e3ff8ee22b683f1b7753a2246265e393e9b0ad44.zip chromium_src-e3ff8ee22b683f1b7753a2246265e393e9b0ad44.tar.gz chromium_src-e3ff8ee22b683f1b7753a2246265e393e9b0ad44.tar.bz2 | |
Rename crypto/third_party/nss headers to avoid mixups.
When trying to include the real NSS headers from other files under
crypto/third_party/nss, the local versions would get used on the MSVS
build.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8538025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110009 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/third_party')
| -rw-r--r-- | crypto/third_party/nss/chromium-blapi.h (renamed from crypto/third_party/nss/blapi.h) | 8 | ||||
| -rw-r--r-- | crypto/third_party/nss/chromium-blapit.h (renamed from crypto/third_party/nss/blapit.h) | 6 | ||||
| -rw-r--r-- | crypto/third_party/nss/chromium-sha256.h (renamed from crypto/third_party/nss/sha256.h) | 6 | ||||
| -rw-r--r-- | crypto/third_party/nss/sha512.cc | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/crypto/third_party/nss/blapi.h b/crypto/third_party/nss/chromium-blapi.h index 3b0c60a..2ca772e 100644 --- a/crypto/third_party/nss/blapi.h +++ b/crypto/third_party/nss/chromium-blapi.h @@ -39,10 +39,10 @@ * ***** END LICENSE BLOCK ***** */ /* $Id: blapi.h,v 1.27 2007/11/09 18:49:32 wtc%google.com Exp $ */ -#ifndef _BLAPI_H_ -#define _BLAPI_H_ +#ifndef CRYPTO_THIRD_PARTY_NSS_CHROMIUM_BLAPI_H_ +#define CRYPTO_THIRD_PARTY_NSS_CHROMIUM_BLAPI_H_ -#include "crypto/third_party/nss/blapit.h" +#include "crypto/third_party/nss/chromium-blapit.h" /******************************************/ @@ -98,4 +98,4 @@ extern SECStatus SHA384_Flatten(SHA384Context *cx,unsigned char *space); extern SHA384Context * SHA384_Resurrect(unsigned char *space, void *arg); extern void SHA384_Clone(SHA384Context *dest, SHA384Context *src); -#endif /* _BLAPI_H_ */ +#endif /* CRYPTO_THIRD_PARTY_NSS_CHROMIUM_BLAPI_H_ */ diff --git a/crypto/third_party/nss/blapit.h b/crypto/third_party/nss/chromium-blapit.h index e16a084..669f64d 100644 --- a/crypto/third_party/nss/blapit.h +++ b/crypto/third_party/nss/chromium-blapit.h @@ -40,8 +40,8 @@ * ***** END LICENSE BLOCK ***** */ /* $Id: blapit.h,v 1.20 2007/02/28 19:47:37 rrelyea%redhat.com Exp $ */ -#ifndef _BLAPIT_H_ -#define _BLAPIT_H_ +#ifndef CRYPTO_THIRD_PARTY_NSS_CHROMIUM_BLAPIT_H_ +#define CRYPTO_THIRD_PARTY_NSS_CHROMIUM_BLAPIT_H_ #include "base/third_party/nspr/prtypes.h" @@ -88,4 +88,4 @@ typedef struct SHA512ContextStr SHA512Context; /* SHA384Context is really a SHA512ContextStr. This is not a mistake. */ typedef struct SHA512ContextStr SHA384Context; -#endif /* _BLAPIT_H_ */ +#endif /* CRYPTO_THIRD_PARTY_NSS_CHROMIUM_BLAPIT_H_ */ diff --git a/crypto/third_party/nss/sha256.h b/crypto/third_party/nss/chromium-sha256.h index e641b49..14661dc 100644 --- a/crypto/third_party/nss/sha256.h +++ b/crypto/third_party/nss/chromium-sha256.h @@ -34,8 +34,8 @@ * * ***** END LICENSE BLOCK ***** */ -#ifndef _SHA_256_H_ -#define _SHA_256_H_ +#ifndef CRYPTO_THIRD_PARTY_NSS_CHROMIUM_SHA_256_H_ +#define CRYPTO_THIRD_PARTY_NSS_CHROMIUM_SHA_256_H_ #include "base/third_party/nspr/prtypes.h" @@ -48,4 +48,4 @@ struct SHA256ContextStr { PRUint32 sizeHi,sizeLo; /* 64-bit count of hashed bytes. */ }; -#endif /* _SHA_256_H_ */ +#endif /* CRYPTO_THIRD_PARTY_NSS_CHROMIUM_SHA_256_H_ */ diff --git a/crypto/third_party/nss/sha512.cc b/crypto/third_party/nss/sha512.cc index 6c04674..976a604 100644 --- a/crypto/third_party/nss/sha512.cc +++ b/crypto/third_party/nss/sha512.cc @@ -47,8 +47,8 @@ #define NOUNROLL512 1 #undef HAVE_LONG_LONG #endif -#include "crypto/third_party/nss/blapi.h" -#include "crypto/third_party/nss/sha256.h" /* for struct SHA256ContextStr */ +#include "crypto/third_party/nss/chromium-blapi.h" +#include "crypto/third_party/nss/chromium-sha256.h" /* for struct SHA256ContextStr */ #include <stdlib.h> #include <string.h> |