Roll libjingle to r124 and roll webrtc to 1888.

third_party/libjingle/overrides/talk/base/byteorder.h

 /*
  * libjingle
  * Copyright 2004--2005, Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without 
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice, 
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 15 matching lines @@
  */
 
 #ifndef TALK_BASE_BYTEORDER_H__
 #define TALK_BASE_BYTEORDER_H__
 
 #ifdef POSIX
 #include <arpa/inet.h>
 #endif
 
 #ifdef WIN32
+#include <stdlib.h>
 #include <winsock2.h>
-#include "talk/base/win32.h"
 #endif
 
 #include "talk/base/basictypes.h"
 
 namespace talk_base {
 
 // Reading and writing of little and big-endian numbers from memory
 // TODO: Add HostEndian #defines (HE)
 // TODO: Consider NetworkEndian as synonym for BigEndian, for clarity in use.
 // TODO: Consider creating optimized versions, such as direct read/writes of
@@ skipping 88 matching lines @@
        | (static_cast<uint64>(Get8(memory, 0)) <<  0);
 }
 
 // Check if the current host is big endian.
 inline bool IsHostBigEndian() {
   static const int number = 1;
   return (0 == *reinterpret_cast<const char*>(&number));
 }
 
 inline uint16 HostToNetwork16(uint16 n) {
+#ifdef WIN32
+  // This and below _byteswap_* are to remove the dependency to ws2_32.dll
+  // especially for chrome, where we don't load the ws2_32.dll in the render
+  // process. This is correct only on little-endian machines.
+  return _byteswap_ushort(n);
+#else
   return htons(n);
+#endif
 }
 
 inline uint32 HostToNetwork32(uint32 n) {
+#ifdef WIN32
+  return _byteswap_ulong(n);
+#else
   return htonl(n);
+#endif
 }
 
 inline uint64 HostToNetwork64(uint64 n) {
   // If the host is little endian, GetBE64 converts n to big network endian.
   return IsHostBigEndian() ? n : GetBE64(&n);
 }
 
 inline uint16 NetworkToHost16(uint16 n) {
+#ifdef WIN32
+  return _byteswap_ushort(n);
+#else
   return ntohs(n);
+#endif
 }
 
 inline uint32 NetworkToHost32(uint32 n) {
+#ifdef WIN32
+  return _byteswap_ulong(n);
+#else
   return ntohl(n);
+#endif
 }
 
 inline uint64 NetworkToHost64(uint64 n) {
   // If the host is little endian, GetBE64 converts n to little endian.
   return IsHostBigEndian() ? n : GetBE64(&n);
 }
 
 }  // namespace talk_base
 
 #endif  // TALK_BASE_BYTEORDER_H__