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

talk/media/sctp/sctpdataengine.cc

Index: talk/media/sctp/sctpdataengine.cc
diff --git a/talk/media/sctp/sctpdataengine.cc b/talk/media/sctp/sctpdataengine.cc
index 1ead8e0f2ee9896d672f3e583cb30e86c42b8bbb..739383d379579c2ec6904f4e74b045cf8f4630e7 100644
--- a/talk/media/sctp/sctpdataengine.cc
+++ b/talk/media/sctp/sctpdataengine.cc
@@ -88,7 +88,7 @@ std::string ListFlags(int flags) {
 
 // Returns a comma-separated, human-readable list of the integers in 'array'.
 // All 'num_elems' of them.
-std::string ListArray(const uint16* array, int num_elems) {
+std::string ListArray(const uint16_t* array, int num_elems) {
   std::stringstream result;
   for (int i = 0; i < num_elems; ++i) {
     if (i) {
@@ -575,7 +575,7 @@ bool SctpDataMediaChannel::AddSendStream(const StreamParams& stream) {
   return AddStream(stream);
 }
 
-bool SctpDataMediaChannel::RemoveSendStream(uint32 ssrc) {
+bool SctpDataMediaChannel::RemoveSendStream(uint32_t ssrc) {
   return ResetStream(ssrc);
 }
 
@@ -586,7 +586,7 @@ bool SctpDataMediaChannel::AddRecvStream(const StreamParams& stream) {
   return true;
 }
 
-bool SctpDataMediaChannel::RemoveRecvStream(uint32 ssrc) {
+bool SctpDataMediaChannel::RemoveRecvStream(uint32_t ssrc) {
   // SCTP DataChannels are always bi-directional and calling RemoveSendStream
   // will disable both sending and receiving on the stream. So RemoveRecvStream
   // is a no-op.
@@ -727,7 +727,7 @@ bool SctpDataMediaChannel::AddStream(const StreamParams& stream) {
     return false;
   }
 
-  const uint32 ssrc = stream.first_ssrc();
+  const uint32_t ssrc = stream.first_ssrc();
   if (open_streams_.find(ssrc) != open_streams_.end()) {
     LOG(LS_WARNING) << debug_name_ << "->Add(Send|Recv)Stream(...): "
                     << "Not adding data stream '" << stream.id
@@ -747,7 +747,7 @@ bool SctpDataMediaChannel::AddStream(const StreamParams& stream) {
   return true;
 }
 
-bool SctpDataMediaChannel::ResetStream(uint32 ssrc) {
+bool SctpDataMediaChannel::ResetStream(uint32_t ssrc) {
   // We typically get this called twice for the same stream, once each for
   // Send and Recv.
   StreamSet::iterator found = open_streams_.find(ssrc);
@@ -997,10 +997,10 @@ bool SctpDataMediaChannel::SendQueuedStreamResets() {
                   << ListStreams(sent_reset_streams_) << "]";
 
   const size_t num_streams = queued_reset_streams_.size();
-  const size_t num_bytes = sizeof(struct sctp_reset_streams)
-    + (num_streams * sizeof(uint16));
+  const size_t num_bytes =
+      sizeof(struct sctp_reset_streams) + (num_streams * sizeof(uint16_t));
 
-  std::vector<uint8> reset_stream_buf(num_bytes, 0);
+  std::vector<uint8_t> reset_stream_buf(num_bytes, 0);
   struct sctp_reset_streams* resetp = reinterpret_cast<sctp_reset_streams*>(
       &reset_stream_buf[0]);
   resetp->srs_assoc_id = SCTP_ALL_ASSOC;