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

json.h include different header files depending on WEBRTC_CHROMIUM_BUILD being defined or not. Since json.h/cc is not even used in chromium it is the wrong flag to use. Instead add WEBRTC_EXTERNAL define. Also added OWNERS for base which is a copy of system_wrappers owners as the two folders are being merged.

Browse Source 
BUG=3379
R=niklas.enbom@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6421 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org 2014-06-12 21:43:04 +00:00
parent ddeec048c0
commit 3c13ed3b93
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
webrtc/base/OWNERS Normal file
View File

@ -0,0 +1,7 @@
henrike@webrtc.org
pwestin@webrtc.org
perkj@webrtc.org
henrika@webrtc.org
henrikg@webrtc.org
mflodman@webrtc.org
niklas.enbom@webrtc.org

2
webrtc/base/json.h
View File

@ -14,7 +14,7 @@
#include <string>
#include <vector>
#if !defined(WEBRTC_CHROMIUM_BUILD)
#if !defined(WEBRTC_EXTERNAL)
#include "json/json.h"
#else
#include "third_party/jsoncpp/json.h"