From a99069db6397ca9377ed473cdbfc6c4a53e22d98 Mon Sep 17 00:00:00 2001
From: pbos <pbos@webrtc.org>
Date: Fri, 23 Oct 2015 06:32:40 -0700
Subject: [PATCH] Fix win32 header include order in rtp_utility.h.

Matches the include order in webrtc/base/criticalsection.h and makes use
of winsock2.h instead of winsock.h for consistency.

BUG=
R=tommi@webrtc.org

Review URL: https://codereview.webrtc.org/1407053008

Cr-Commit-Position: refs/heads/master@{#10389}
---
 webrtc/modules/rtp_rtcp/source/rtp_utility.cc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/webrtc/modules/rtp_rtcp/source/rtp_utility.cc b/webrtc/modules/rtp_rtcp/source/rtp_utility.cc
index 2727e7b8bc..28830f2e66 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_utility.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_utility.cc
@@ -16,10 +16,8 @@
 
 #if defined(_WIN32)
 // Order for these headers are important
-#include <Windows.h>  // FILETIME
-
-#include <WinSock.h>  // timeval
-
+#include <winsock2.h>  // timeval
+#include <windows.h>  // FILETIME
 #include <MMSystem.h>  // timeGetTime
 #elif ((defined WEBRTC_LINUX) || (defined WEBRTC_MAC))
 #include <sys/time.h>  // gettimeofday