From 3c13ed3b93f407c0bc2fe6567aff221b60071d68 Mon Sep 17 00:00:00 2001 From: "henrike@webrtc.org" Date: Thu, 12 Jun 2014 21:43:04 +0000 Subject: [PATCH] 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. 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 --- webrtc/base/OWNERS | 7 +++++++ webrtc/base/json.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 webrtc/base/OWNERS diff --git a/webrtc/base/OWNERS b/webrtc/base/OWNERS new file mode 100644 index 0000000000..4091a93d74 --- /dev/null +++ b/webrtc/base/OWNERS @@ -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 \ No newline at end of file diff --git a/webrtc/base/json.h b/webrtc/base/json.h index fe41ac805b..a8f76be17c 100644 --- a/webrtc/base/json.h +++ b/webrtc/base/json.h @@ -14,7 +14,7 @@ #include #include -#if !defined(WEBRTC_CHROMIUM_BUILD) +#if !defined(WEBRTC_EXTERNAL) #include "json/json.h" #else #include "third_party/jsoncpp/json.h"