generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Attempt at fixing error on the Chrome Windows FYI bots.

Browse Source 
It looks like our basictypes.h file in the overrides folder is including the file it is overriding due to include path precedence (Chrome's is lower than WebRTCs).

TBR=henrika@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/51909004

Cr-Commit-Position: refs/heads/master@{#9280}
This commit is contained in:
Tommi 2015-05-25 21:22:13 +02:00
parent 905495cfaa
commit 32c2023fb6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/overrides/webrtc/base/basictypes.h
View File

@ -15,8 +15,10 @@
#ifndef OVERRIDES_WEBRTC_BASE_BASICTYPES_H__
#define OVERRIDES_WEBRTC_BASE_BASICTYPES_H__
#include "base/basictypes.h"
#include "build/build_config.h"
// We can't include these files directly via "base/foo.h" since we might
// inadvertently include the very files we're overriding.
#include "../../../../../base/basictypes.h"
#include "../../../../../build/build_config.h"
#ifndef INT_TYPES_DEFINED
#define INT_TYPES_DEFINED