Index: crypto/nss_util.h |
diff --git a/crypto/nss_util.h b/crypto/nss_util.h |
index 06c1e5d9d5220478dc3fc46f4a5992f2a249e68d..71e5a67b3a0b56f1ab5a7cbabc08c1eaf815d4a5 100644 |
--- a/crypto/nss_util.h |
+++ b/crypto/nss_util.h |
@@ -5,10 +5,12 @@ |
#ifndef CRYPTO_NSS_UTIL_H_ |
#define CRYPTO_NSS_UTIL_H_ |
+#include <stdint.h> |
+ |
#include <string> |
-#include "base/basictypes.h" |
#include "base/callback.h" |
#include "base/compiler_specific.h" |
+#include "base/macros.h" |
#include "crypto/crypto_export.h" |
namespace base { |
@@ -72,12 +74,12 @@ CRYPTO_EXPORT void InitializeTPMTokenAndSystemSlot( |
#endif |
// 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_EXPORT base::Time PRTimeToBaseTime(int64 prtime); |
+// We use a int64_t instead of PRTime here to avoid depending on NSPR headers. |
+CRYPTO_EXPORT base::Time PRTimeToBaseTime(int64_t prtime); |
// Convert a base::Time object into a PRTime value. |
-// We use a int64 instead of PRTime here to avoid depending on NSPR headers. |
-CRYPTO_EXPORT int64 BaseTimeToPRTime(base::Time time); |
+// We use a int64_t instead of PRTime here to avoid depending on NSPR headers. |
+CRYPTO_EXPORT int64_t BaseTimeToPRTime(base::Time time); |
#if defined(USE_NSS_CERTS) |
// NSS has a bug which can cause a deadlock or stall in some cases when writing |