summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNanang Izzuddin <nanang@teluu.com>2014-03-10 08:58:49 +0000
committerNanang Izzuddin <nanang@teluu.com>2014-03-10 08:58:49 +0000
commit369f12026f81c0723ab6799810bbe5f0291d50ae (patch)
treeb9172592176d58cd5cea2df15878bc18a27951a9
parent88904608eee78a8e4706f75038a8f9e693abe49a (diff)
Re #1745 (Shared lib on MinGW): Fixed multiple definition of pj_time_decode/encode().
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4784 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r--pjlib/src/pj/os_time_common.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/pjlib/src/pj/os_time_common.c b/pjlib/src/pj/os_time_common.c
index c3c2a9c0..da4440d1 100644
--- a/pjlib/src/pj/os_time_common.c
+++ b/pjlib/src/pj/os_time_common.c
@@ -24,6 +24,8 @@
///////////////////////////////////////////////////////////////////////////////
+#if !defined(PJ_WIN32) || PJ_WIN32==0
+
PJ_DEF(pj_status_t) pj_time_decode(const pj_time_val *tv, pj_parsed_time *pt)
{
struct tm *local_time;
@@ -65,6 +67,9 @@ PJ_DEF(pj_status_t) pj_time_encode(const pj_parsed_time *pt, pj_time_val *tv)
return PJ_SUCCESS;
}
+#endif /* !PJ_WIN32 */
+
+
/**
* Convert local time to GMT.
*/