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

Protect ENABLE_PROFILING to fix profiling=1.

Browse Source 
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
This commit is contained in:
andrew@webrtc.org 2014-03-27 22:44:13 +00:00
parent dd0b99debb
commit a5586b50e5
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
talk/base/profiler.h
View File

@ -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