diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-25 11:39:07 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-25 15:20:42 +0000 |
| commit | 6c91641271e536ffaa88a1dff5127e42ee99a91e (patch) | |
| tree | 703d9dd49602377ddc90cbf886aad37913f2496b /chromium/crypto/cssm_init.cc | |
| parent | b145b7fafd36f0c260d6a768c81fc14e32578099 (diff) | |
| download | qtwebengine-chromium-6c91641271e536ffaa88a1dff5127e42ee99a91e.tar.gz | |
BASELINE: Update Chromium to 49.0.2623.23
Also adds missing printing sources.
Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/crypto/cssm_init.cc')
| -rw-r--r-- | chromium/crypto/cssm_init.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chromium/crypto/cssm_init.cc b/chromium/crypto/cssm_init.cc index 495e71b68ab..6fa585abb34 100644 --- a/chromium/crypto/cssm_init.cc +++ b/chromium/crypto/cssm_init.cc @@ -5,6 +5,7 @@ #include "crypto/cssm_init.h" #include <Security/SecBase.h> +#include <stdint.h> #include "base/logging.h" #include "base/mac/scoped_cftyperef.h" @@ -32,7 +33,7 @@ void* CSSMRealloc(void* ptr, CSSM_SIZE size, void* alloc_ref) { return realloc(ptr, size); } -void* CSSMCalloc(uint32 num, CSSM_SIZE size, void* alloc_ref) { +void* CSSMCalloc(uint32_t num, CSSM_SIZE size, void* alloc_ref) { return calloc(num, size); } |