Switch to standard integer types in base/strings/.

base/strings/string16.h

 // Copyright 2013 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.
 
 #ifndef BASE_STRINGS_STRING16_H_
 #define BASE_STRINGS_STRING16_H_
 
 // WHAT:
 // A version of std::basic_string that provides 2-byte characters even when
 // wchar_t is not implemented as a 2-byte type. You can access this class as
 // string16. We also define char16, which string16 is based upon.
 //
 // WHY:
 // On Windows, wchar_t is 2 bytes, and it can conveniently handle UTF-16/UCS-2
 // data. Plenty of existing code operates on strings encoded as UTF-16.
 //
 // On many other platforms, sizeof(wchar_t) is 4 bytes by default. We can make
 // it 2 bytes by using the GCC flag -fshort-wchar. But then std::wstring fails
 // at run time, because it calls some functions (like wcslen) that come from
 // the system's native C library -- which was built with a 4-byte wchar_t!
 // It's wasteful to use 4-byte wchar_t strings to carry UTF-16 data, and it's
 // entirely improper on those systems where the encoding of wchar_t is defined
 // as UTF-32.
 //
 // Here, we define string16, which is similar to std::wstring but replaces all
 // libc functions with custom, 2-byte-char compatible routines. It is capable
 // of carrying UTF-16-encoded data.
 
+#include <stddef.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <string>
 
 #include "base/base_export.h"
-#include "base/basictypes.h"
+#include "build/build_config.h"
 
 #if defined(WCHAR_T_IS_UTF16)
 
 namespace base {
 
 typedef wchar_t char16;
 typedef std::wstring string16;
 typedef std::char_traits<wchar_t> string16_char_traits;
 
 }  // namespace base
 
 #elif defined(WCHAR_T_IS_UTF32)
 
 namespace base {
 
-typedef uint16 char16;
+typedef uint16_t char16;
 
 // char16 versions of the functions required by string16_char_traits; these
 // are based on the wide character functions of similar names ("w" or "wcs"
 // instead of "c16").
 BASE_EXPORT int c16memcmp(const char16* s1, const char16* s2, size_t n);
 BASE_EXPORT size_t c16len(const char16* s);
 BASE_EXPORT const char16* c16memchr(const char16* s, char16 c, size_t n);
 BASE_EXPORT char16* c16memmove(char16* s1, const char16* s2, size_t n);
 BASE_EXPORT char16* c16memcpy(char16* s1, const char16* s2, size_t n);
 BASE_EXPORT char16* c16memset(char16* s, char16 c, size_t n);
@@ skipping 116 matching lines @@
 // boundaries, such as in statically-linked executables.
 //
 // TODO(mark): File this bug with Apple and update this note with a bug number.
 
 extern template
 class BASE_EXPORT std::basic_string<base::char16, base::string16_char_traits>;
 
 #endif  // WCHAR_T_IS_UTF32
 
 #endif  // BASE_STRINGS_STRING16_H_