Switch to standard integer types in base/i18n/.

base/i18n/icu_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/i18n/icu_util.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #include <string>
 
 #include "base/debug/alias.h"
 #include "base/files/file_path.h"
 #include "base/files/memory_mapped_file.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
+#include "build/build_config.h"
 #include "third_party/icu/source/common/unicode/putil.h"
 #include "third_party/icu/source/common/unicode/udata.h"
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 #include "third_party/icu/source/i18n/unicode/timezone.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "base/android/apk_assets.h"
 #endif
 
@@ skipping 118 matching lines @@
   }
 
   scoped_ptr<MemoryMappedFile> icudtl_mapped_file(new MemoryMappedFile());
   if (!icudtl_mapped_file->Initialize(File(data_fd), data_region)) {
     LOG(ERROR) << "Couldn't mmap icu data file";
     return false;
   }
   g_icudtl_mapped_file = icudtl_mapped_file.release();
 
   UErrorCode err = U_ZERO_ERROR;
-  udata_setCommonData(const_cast<uint8*>(g_icudtl_mapped_file->data()), &err);
+  udata_setCommonData(const_cast<uint8_t*>(g_icudtl_mapped_file->data()), &err);
   return err == U_ZERO_ERROR;
 }
 #endif  // ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE
 #endif  // !defined(OS_NACL)
 
 }  // namespace
 
 #if !defined(OS_NACL)
 #if ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE
 #if defined(OS_ANDROID)
 bool InitializeICUWithFileDescriptor(
     PlatformFile data_fd,
     const MemoryMappedFile::Region& data_region) {
 #if !defined(NDEBUG)
   DCHECK(!g_check_called_once || !g_called_once);
   g_called_once = true;
 #endif
   return InitializeICUWithFileDescriptorInternal(data_fd, data_region);
 }
 
 PlatformFile GetIcuDataFileHandle(MemoryMappedFile::Region* out_region) {
   CHECK_NE(g_icudtl_pf, kInvalidPlatformFile);
   *out_region = g_icudtl_region;
   return g_icudtl_pf;
 }
 #endif
 
-const uint8* GetRawIcuMemory() {
+const uint8_t* GetRawIcuMemory() {
   CHECK(g_icudtl_mapped_file);
   return g_icudtl_mapped_file->data();
 }
 
-bool InitializeICUFromRawMemory(const uint8* raw_memory) {
+bool InitializeICUFromRawMemory(const uint8_t* raw_memory) {
 #if !defined(COMPONENT_BUILD)
 #if !defined(NDEBUG)
   DCHECK(!g_check_called_once || !g_called_once);
   g_called_once = true;
 #endif
 
   UErrorCode err = U_ZERO_ERROR;
-  udata_setCommonData(const_cast<uint8*>(raw_memory), &err);
+  udata_setCommonData(const_cast<uint8_t*>(raw_memory), &err);
   return err == U_ZERO_ERROR;
 #else
   return true;
 #endif
 }
 
 #endif  // ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE
 
 bool InitializeICU() {
 #if !defined(NDEBUG)
@@ skipping 54 matching lines @@
 #endif  // !defined(OS_NACL)
 
 void AllowMultipleInitializeCallsForTesting() {
 #if !defined(NDEBUG) && !defined(OS_NACL)
   g_check_called_once = false;
 #endif
 }
 
 }  // namespace i18n
 }  // namespace base