zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a name collision with Android libc++

Browse Source 
The Android libc++ has a symbol called '_P'
This CL renames a property called _P in webrtc.

BUG=chromium:427718
R=andrew@webrtc.org

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

Patch from Fabrice de Gans-Riberi <fdegans@chromium.org>.

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7579 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org
2014-10-31 16:01:25 +00:00
parent b7ed7799e7
commit cc476aa038
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/system_wrappers/interface/timestamp_extrapolator.h
View File

@ -31,7 +31,7 @@ private:
bool DelayChangeDetection(double error);
RWLockWrapper* _rwLock;
double _w[2];
double _P[2][2];
double _pP[2][2];
int64_t _startMs;
int64_t _prevMs;
uint32_t _firstTimestamp;
@ -48,7 +48,7 @@ private:
const double _alarmThreshold;
const double _accDrift;
const double _accMaxError;
const double _P11;
const double _pP11;
};
} // namespace webrtc