From a5586b50e5cc19c0721a5d62ba8e950d16f637f9 Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Thu, 27 Mar 2014 22:44:13 +0000 Subject: [PATCH] Protect ENABLE_PROFILING to fix profiling=1. Chromium defines ENABLE_PROFILING under the gyp flag profiling=1. This corrects the resulting mulitple defintion error: ../../talk/base/profiler.h:61:9: error: 'ENABLE_PROFILING' macro redefined [-Werror] #define ENABLE_PROFILING and allows us to use profiling=1 in standalone builds. TESTED=build passes with profiling=1 R=wu@webrtc.org Review URL: https://webrtc-codereview.appspot.com/10829004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5804 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/base/profiler.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/talk/base/profiler.h b/talk/base/profiler.h index 90c5c722a3..f74a540ae4 100644 --- a/talk/base/profiler.h +++ b/talk/base/profiler.h @@ -57,7 +57,9 @@ #include "talk/base/sharedexclusivelock.h" // Profiling could be switched via a build flag, but for now, it's always on. +#ifndef ENABLE_PROFILING #define ENABLE_PROFILING +#endif #ifdef ENABLE_PROFILING