From 4a4e6884387b0970493880dab6342e0d1ff1332c Mon Sep 17 00:00:00 2001 From: "tommi@webrtc.org" Date: Wed, 4 Mar 2015 20:09:37 +0000 Subject: [PATCH] Remove dependecy on win32.h in criticalsection.h. This was causing build errors that we haven't fully figured out yet but somehow this caused override files to include the files they're supposed to override, which in turn included webrtc build files that then conflict with Chromium's configuration. TBR=magjed@webrtc.org Review URL: https://webrtc-codereview.appspot.com/45479004 Cr-Commit-Position: refs/heads/master@{#8601} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8601 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/base/criticalsection.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/webrtc/base/criticalsection.h b/webrtc/base/criticalsection.h index 84c488ba82..3a1f6a4ec7 100644 --- a/webrtc/base/criticalsection.h +++ b/webrtc/base/criticalsection.h @@ -15,7 +15,12 @@ #include "webrtc/base/thread_annotations.h" #if defined(WEBRTC_WIN) -#include "webrtc/base/win32.h" +// Include winsock2.h before including to maintain consistency with +// win32.h. We can't include win32.h directly here since it pulls in +// headers such as basictypes.h which causes problems in Chromium where webrtc +// exists as two separate projects, webrtc and libjingle. +#include +#include #endif #if defined(WEBRTC_POSIX)