diff options
author | Benny Prijono <bennylp@teluu.com> | 2014-02-12 05:18:31 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2014-02-12 05:18:31 +0000 |
commit | e72b82609c1822ca2574286160e0385073f4ab93 (patch) | |
tree | 9a1a927a2fc594901eb098c32aca2cec276c9d61 /pjsip/src/pjsua2 | |
parent | 507bdb737142e1fb7488936efb0ebfc258f1da61 (diff) |
More pjsua2 API (re #1519): renamed TimeValue to TimeVal due to conflict in iOS SDK
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4742 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/src/pjsua2')
-rw-r--r-- | pjsip/src/pjsua2/types.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pjsip/src/pjsua2/types.cpp b/pjsip/src/pjsua2/types.cpp index 26740cc7..b62fab5a 100644 --- a/pjsip/src/pjsua2/types.cpp +++ b/pjsip/src/pjsua2/types.cpp @@ -87,7 +87,7 @@ string Error::info(bool multi_line) const /////////////////////////////////////////////////////////////////////////////// -void TimeValue::fromPj(const pj_time_val &prm) +void TimeVal::fromPj(const pj_time_val &prm) { this->sec = prm.sec; this->msec = prm.msec; |