Made some global statics have function scope so that the global static count is 0 for the rtp_rtcp module.
Review URL: http://webrtc-codereview.appspot.com/316001 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1125 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
parent
80b2661dc6
commit
441b3fe2a1
@ -250,14 +250,14 @@ void UnixSystemClock::CurrentNTP(WebRtc_UWord32& secs, WebRtc_UWord32& frac)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
RtpRtcpClock* GetSystemClock()
|
||||||
|
{
|
||||||
|
// TODO(hellner): violates the style guide (non-POD static instance).
|
||||||
#if defined(_WIN32)
|
#if defined(_WIN32)
|
||||||
static WindowsSystemClock system_clock;
|
static WindowsSystemClock system_clock;
|
||||||
#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
|
#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
|
||||||
static UnixSystemClock system_clock;
|
static UnixSystemClock system_clock;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
RtpRtcpClock* GetSystemClock()
|
|
||||||
{
|
|
||||||
return &system_clock;
|
return &system_clock;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user