From 30142bbe071206599fdb69e88b92b22c38c1354a Mon Sep 17 00:00:00 2001 From: "aluebs@webrtc.org" Date: Sat, 14 Feb 2015 02:45:57 +0000 Subject: [PATCH] Add arraysize to overrides to avoid macros redefinitions in Chromium This fixes the Webrtc in Chrome FYI bots breaking. TBR=ajm Review URL: https://webrtc-codereview.appspot.com/36149004 Cr-Commit-Position: refs/heads/master@{#8371} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8371 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/overrides/webrtc/base/arraysize.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 webrtc/overrides/webrtc/base/arraysize.h diff --git a/webrtc/overrides/webrtc/base/arraysize.h b/webrtc/overrides/webrtc/base/arraysize.h new file mode 100644 index 0000000000..abc1240fe5 --- /dev/null +++ b/webrtc/overrides/webrtc/base/arraysize.h @@ -0,0 +1,20 @@ +/* + * Copyright 2015 The WebRTC Project Authors. All rights reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +// This file overrides the inclusion of webrtc/base/arraysize.h +// We do this because in Chromium it redefines arraysize, which is already +// defined in base/macros.h. + +#ifndef OVERRIDES_WEBRTC_BASE_ARRAYSIZE_H__ +#define OVERRIDES_WEBRTC_BASE_ARRAYSIZE_H__ + +#include "base/macros.h" + +#endif // OVERRIDES_WEBRTC_BASE_ARRAYSIZE_H__