diff options
author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 18:45:12 +0000 |
---|---|---|
committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 18:45:12 +0000 |
commit | 6adc95e84aa4a1fb933f995ad31faafc4a451065 (patch) | |
tree | 57ff856ef5a0c6ec97c7f6d55df3e07c5e5df19a /crypto/nss_util.h | |
parent | dfb86ba4b8d9090ee64e9cc7643fb132ebd20b6f (diff) | |
download | chromium_src-6adc95e84aa4a1fb933f995ad31faafc4a451065.zip chromium_src-6adc95e84aa4a1fb933f995ad31faafc4a451065.tar.gz chromium_src-6adc95e84aa4a1fb933f995ad31faafc4a451065.tar.bz2 |
Revert "crypto: enable components build for Linux"
This reverts commit r92188, link failures in skia (!).
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92206 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/nss_util.h')
-rw-r--r-- | crypto/nss_util.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/crypto/nss_util.h b/crypto/nss_util.h index 4513abc..19298ca 100644 --- a/crypto/nss_util.h +++ b/crypto/nss_util.h @@ -28,7 +28,7 @@ namespace crypto { // EarlySetupForNSSInit performs lightweight setup which must occur before the // process goes multithreaded. This does not initialise NSS. For test, see // EnsureNSSInit. -CRYPTO_API void EarlySetupForNSSInit(); +void EarlySetupForNSSInit(); #endif // Initialize NRPR if it isn't already initialized. This function is @@ -55,7 +55,7 @@ void CRYPTO_API EnsureNSSInit(); // Calling this method only has effect on Linux. // // WARNING: Use this with caution. -CRYPTO_API void ForceNSSNoDBInit(); +void ForceNSSNoDBInit(); // This methods is used to disable checks in NSS when used in a forked process. // NSS checks whether it is running a forked process to avoid problems when @@ -66,7 +66,7 @@ CRYPTO_API void ForceNSSNoDBInit(); // This method must be called before EnsureNSSInit() to take effect. // // WARNING: Use this with caution. -CRYPTO_API void DisableNSSForkCheck(); +void DisableNSSForkCheck(); // Load NSS library files. This function has no effect on Mac and Windows. // This loads the necessary NSS library files so that NSS can be initialized @@ -75,7 +75,7 @@ CRYPTO_API void DisableNSSForkCheck(); // // Note that this does not load libnssckbi.so which contains the root // certificates. -CRYPTO_API void LoadNSSLibraries(); +void LoadNSSLibraries(); // Check if the current NSS version is greater than or equals to |version|. // A sample version string is "3.12.3". @@ -136,14 +136,14 @@ bool EnsureTPMTokenReady(); // Convert a NSS PRTime value into a base::Time object. // We use a int64 instead of PRTime here to avoid depending on NSPR headers. -CRYPTO_API base::Time PRTimeToBaseTime(int64 prtime); +base::Time PRTimeToBaseTime(int64 prtime); #if defined(USE_NSS) // Exposed for unittests only. |path| should be an existing directory under // which the DB files will be placed. |description| is a user-visible name for // the DB, as a utf8 string, which will be truncated at 32 bytes. -CRYPTO_API bool OpenTestNSSDB(const FilePath& path, const char* description); -CRYPTO_API void CloseTestNSSDB(); +bool OpenTestNSSDB(const FilePath& path, const char* description); +void CloseTestNSSDB(); // NSS has a bug which can cause a deadlock or stall in some cases when writing // to the certDB and keyDB. It also has a bug which causes concurrent key pair @@ -157,7 +157,7 @@ base::Lock* GetNSSWriteLock(); // A helper class that acquires the NSS write Lock while the AutoNSSWriteLock // is in scope. -class CRYPTO_API AutoNSSWriteLock { +class AutoNSSWriteLock { public: AutoNSSWriteLock(); ~AutoNSSWriteLock(); |