Use suffixed {uint,int}{8,16,32,64}_t types.

webrtc/base/nssidentity.h

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_BASE_NSSIDENTITY_H_
 #define WEBRTC_BASE_NSSIDENTITY_H_
 
 #include <string>
 
-// Hack: Define+undefine int64 and uint64 to avoid typedef conflict with NSS.
+// Hack: Define+undefine int64_t and uint64_t to avoid typedef conflict with
+// NSS.
 // TODO(kjellander): Remove when webrtc:4497 is completed.
-#define uint64 foo_uint64
-#define int64 foo_int64
+#define uint64_t foo_uint64
+#define int64_t foo_int64
 #include "cert.h"
-#undef uint64
-#undef int64
+#undef uint64_t
+#undef int64_t
 #include "nspr.h"
 #include "hasht.h"
 #include "keythi.h"
 
 #ifdef NSS_SSL_RELATIVE_PATH
 #include "ssl.h"
 #else
 #include "net/third_party/nss/ssl/ssl.h"
 #endif
 
@@ skipping 101 matching lines @@
 
   rtc::scoped_ptr<NSSKeyPair> keypair_;
   rtc::scoped_ptr<NSSCertificate> certificate_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(NSSIdentity);
 };
 
 }  // namespace rtc
 
 #endif  // WEBRTC_BASE_NSSIDENTITY_H_