projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
libjingle
/
source
/
talk
/
p2p
/
base
/
transportdescription.cc
diff --git
a/src/third_party/libjingle/source/talk/p2p/base/transportdescription.cc
b/src/third_party/libjingle/source/talk/p2p/base/transportdescription.cc
index
2793d6c
..
8bdcbb3
100644
(file)
--- a/
src/third_party/libjingle/source/talk/p2p/base/transportdescription.cc
+++ b/
src/third_party/libjingle/source/talk/p2p/base/transportdescription.cc
@@
-25,9
+25,10
@@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "
talk
/p2p/base/transportdescription.h"
+#include "
webrtc
/p2p/base/transportdescription.h"
-#include "talk/p2p/base/constants.h"
+#include "webrtc/p2p/base/constants.h"
+#include "webrtc/base/stringutils.h"
namespace cricket {
namespace cricket {
@@
-40,7
+41,7
@@
bool StringToConnectionRole(const std::string& role_str, ConnectionRole* role) {
};
for (size_t i = 0; i < ARRAY_SIZE(roles); ++i) {
};
for (size_t i = 0; i < ARRAY_SIZE(roles); ++i) {
- if (stricmp(roles[i], role_str.c_str()) == 0) {
+ if (
_
stricmp(roles[i], role_str.c_str()) == 0) {
*role = static_cast<ConnectionRole>(CONNECTIONROLE_ACTIVE + i);
return true;
}
*role = static_cast<ConnectionRole>(CONNECTIONROLE_ACTIVE + i);
return true;
}
@@
-69,4
+70,3
@@
bool ConnectionRoleToString(const ConnectionRole& role, std::string* role_str) {
}
} // namespace cricket
}
} // namespace cricket
-