diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2014-02-24 09:02:44 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2014-02-24 09:02:44 +0000 |
| commit | e36b19cb22fb5b57e7c584defb33c3f5c258ea3c (patch) | |
| tree | 92a63e399543634732b1373b4ac6346077f27a3c /pjlib | |
| parent | 9fbfd6ab5526baa0980fd32cb2406728a0c1e801 (diff) | |
Re #1680: Fixed compile warnings on VS2005 for x64/win64 config.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4761 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib')
| -rw-r--r-- | pjlib/src/pj/errno.c | 4 | ||||
| -rw-r--r-- | pjlib/src/pj/log.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pjlib/src/pj/errno.c b/pjlib/src/pj/errno.c index ff54bd4b..dd39e23c 100644 --- a/pjlib/src/pj/errno.c +++ b/pjlib/src/pj/errno.c @@ -109,7 +109,7 @@ static int pjlib_error(pj_status_t code, char *buf, pj_size_t size) len = pj_ansi_snprintf( buf, size, "Unknown pjlib error %d", code); if (len < 1 || len >= (int)size) - len = size - 1; + len = (int)(size - 1); return len; } @@ -205,7 +205,7 @@ PJ_DEF(pj_str_t) pj_strerror( pj_status_t statcode, } if (len < 1 || len >= (int)bufsize) { - len = bufsize - 1; + len = (int)(bufsize - 1); buf[len] = '\0'; } diff --git a/pjlib/src/pj/log.c b/pjlib/src/pj/log.c index 6f0a5ef4..293ad463 100644 --- a/pjlib/src/pj/log.c +++ b/pjlib/src/pj/log.c @@ -284,7 +284,8 @@ static void resume_logging(int *saved_level) #if PJ_HAS_THREADS if (thread_suspended_tls_id != -1) { - pj_thread_local_set(thread_suspended_tls_id, (void*)PJ_FALSE); + pj_thread_local_set(thread_suspended_tls_id, + (void*)(pj_size_t)PJ_FALSE); } else #endif |