Roll libjingle to r124 and roll webrtc to 1888.

third_party/libjingle/overrides/talk/base/win32.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 29 matching lines @@
 // Add defines that we use if we are compiling against older sdks
 #define SECURITY_MANDATORY_MEDIUM_RID               (0x00002000L)
 #define TokenIntegrityLevel static_cast<TOKEN_INFORMATION_CLASS>(0x19)
 typedef struct _TOKEN_MANDATORY_LABEL {
     SID_AND_ATTRIBUTES Label;
 } TOKEN_MANDATORY_LABEL, *PTOKEN_MANDATORY_LABEL;
 #endif  // SECURITY_MANDATORY_LABEL_AUTHORITY
 
 #undef SetPort
 
-#include <stdlib.h>
 #include <string>
 
 #include "talk/base/stringutils.h"
 #include "talk/base/basictypes.h"
 
-// This is 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.
-#define ntohl(x) _byteswap_ulong(x)
-#define ntohs(x) _byteswap_ushort(x)
-#define htonl(x) _byteswap_ulong(x)
-#define htons(x) _byteswap_ushort(x)
-
 namespace talk_base {
 
 const char* win32_inet_ntop(int af, const void *src, char* dst, socklen_t size);
 int win32_inet_pton(int af, const char* src, void *dst);
 
 ///////////////////////////////////////////////////////////////////////////////
 
 inline std::wstring ToUtf16(const char* utf8, size_t len) {
   int len16 = ::MultiByteToWideChar(CP_UTF8, 0, utf8, len, NULL, 0);
   wchar_t* ws = STACK_ARRAY(wchar_t, len16);
@@ skipping 59 matching lines @@
 }
 
 bool AdjustCurrentProcessPrivilege(const TCHAR* privilege, bool to_enable);
 
 ///////////////////////////////////////////////////////////////////////////////
 
 }  // namespace talk_base
 
 #endif  // WIN32
 #endif  // TALK_BASE_WIN32_H_