Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(66)

Side by Side Diff: third_party/libjingle/files/talk/p2p/base/relayport.cc

Issue 338037: linux: fix gcc 4.3 issues (for arm) (Closed)
Patch Set: Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2004--2005, Google Inc. 3 * Copyright 2004--2005, Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 16 matching lines...) Expand all
27 27
28 #if defined(_MSC_VER) && _MSC_VER < 1300 28 #if defined(_MSC_VER) && _MSC_VER < 1300
29 #pragma warning(disable:4786) 29 #pragma warning(disable:4786)
30 #endif 30 #endif
31 #include "talk/base/logging.h" 31 #include "talk/base/logging.h"
32 #include "talk/base/asynctcpsocket.h" 32 #include "talk/base/asynctcpsocket.h"
33 #include "talk/base/helpers.h" 33 #include "talk/base/helpers.h"
34 #include "talk/p2p/base/relayport.h" 34 #include "talk/p2p/base/relayport.h"
35 #include <iostream> 35 #include <iostream>
36 #include <cassert> 36 #include <cassert>
37 #include <cstring>
37 #ifdef OSX 38 #ifdef OSX
38 #include <errno.h> 39 #include <errno.h>
39 #endif 40 #endif
40 41
41 #if defined(_MSC_VER) && _MSC_VER < 1300 42 #if defined(_MSC_VER) && _MSC_VER < 1300
42 namespace std { 43 namespace std {
43 using ::strerror; 44 using ::strerror;
44 } 45 }
45 #endif 46 #endif
46 47
(...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 if (talk_base::GetMillisecondCount() - start_time_ <= RETRY_TIMEOUT) 626 if (talk_base::GetMillisecondCount() - start_time_ <= RETRY_TIMEOUT)
626 entry_->ScheduleKeepAlive(); 627 entry_->ScheduleKeepAlive();
627 } 628 }
628 629
629 void AllocateRequest::OnTimeout() { 630 void AllocateRequest::OnTimeout() {
630 LOG(INFO) << "Allocate request timed out"; 631 LOG(INFO) << "Allocate request timed out";
631 entry_->HandleConnectFailure(); 632 entry_->HandleConnectFailure();
632 } 633 }
633 634
634 } // namespace cricket 635 } // namespace cricket
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698