diff options
| author | Riza Sulistyo <riza@teluu.com> | 2013-06-19 06:47:43 +0000 |
|---|---|---|
| committer | Riza Sulistyo <riza@teluu.com> | 2013-06-19 06:47:43 +0000 |
| commit | d7aa4332dae06ae890053dd13239ddabee46b86c (patch) | |
| tree | 34c599b317369bcc33827d5ee1200604a6599164 /pjsip/include | |
| parent | 7949b9e53b97281cfa4526ffe5cf7c7d887b7025 (diff) | |
Re #1680: Add initial support for Win64
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4537 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/include')
| -rw-r--r-- | pjsip/include/pjsip/print_util.h | 9 | ||||
| -rw-r--r-- | pjsip/include/pjsip/sip_config.h | 4 | ||||
| -rw-r--r-- | pjsip/include/pjsip/sip_uri.h | 3 |
3 files changed, 9 insertions, 7 deletions
diff --git a/pjsip/include/pjsip/print_util.h b/pjsip/include/pjsip/print_util.h index 6719d6c4..6d82aad7 100644 --- a/pjsip/include/pjsip/print_util.h +++ b/pjsip/include/pjsip/print_util.h @@ -30,7 +30,7 @@ #define copy_advance_pair_check(buf,str1,len1,str2) \ do { \ if (str2.slen) { \ - printed = len1+str2.slen; \ + printed = len1+(int)str2.slen; \ if (printed >= (endbuf-buf)) return -1; \ pj_memcpy(buf,str1,len1); \ pj_memcpy(buf+len1, str2.ptr, str2.slen); \ @@ -53,7 +53,7 @@ #define copy_advance_pair_quote(buf,str1,len1,str2,quotebegin,quoteend) \ do { \ - printed = len1+str2.slen+2; \ + printed = len1+(int)str2.slen+2; \ if (printed >= (endbuf-buf)) return -1; \ pj_memcpy(buf,str1,len1); \ *(buf+len1)=quotebegin; \ @@ -67,7 +67,8 @@ if (str2.slen) { \ if (len1+str2.slen >= (endbuf-buf)) return -1; \ pj_memcpy(buf,str1,len1); \ - printed=pj_strncpy2_escape(buf+len1,&str2,(endbuf-buf-len1),&unres);\ + printed=(int)pj_strncpy2_escape(buf+len1,&str2,(endbuf-buf-len1), \ + &unres);\ if (printed < 0) return -1; \ buf += (printed+len1); \ } \ @@ -83,7 +84,7 @@ #define copy_advance_escape(buf,str,unres) \ do { \ printed = \ - pj_strncpy2_escape(buf, &(str), (endbuf-buf), &(unres)); \ + (int)pj_strncpy2_escape(buf, &(str), (endbuf-buf), &(unres)); \ if (printed < 0) return -1; \ buf += printed; \ } while (0) diff --git a/pjsip/include/pjsip/sip_config.h b/pjsip/include/pjsip/sip_config.h index ec991e88..ed93e92e 100644 --- a/pjsip/include/pjsip/sip_config.h +++ b/pjsip/include/pjsip/sip_config.h @@ -578,7 +578,7 @@ PJ_INLINE(pjsip_cfg_t*) pjsip_cfg(void) * @see PJSIP_TLS_TRANSPORT_REUSEADDR */ #ifndef PJSIP_TCP_TRANSPORT_REUSEADDR -# if defined(PJ_WIN32) && PJ_WIN32 +# if (defined(PJ_WIN32) && PJ_WIN32) || (defined(PJ_WIN64) && PJ_WIN64) # define PJSIP_TCP_TRANSPORT_REUSEADDR 0 # else # define PJSIP_TCP_TRANSPORT_REUSEADDR 1 @@ -702,7 +702,7 @@ PJ_INLINE(pjsip_cfg_t*) pjsip_cfg(void) * @see PJSIP_TCP_TRANSPORT_REUSEADDR */ #ifndef PJSIP_TLS_TRANSPORT_REUSEADDR -# if defined(PJ_WIN32) && PJ_WIN32 +# if (defined(PJ_WIN32) && PJ_WIN32) || (defined(PJ_WIN64) && PJ_WIN64) # define PJSIP_TLS_TRANSPORT_REUSEADDR 0 # else # define PJSIP_TLS_TRANSPORT_REUSEADDR 1 diff --git a/pjsip/include/pjsip/sip_uri.h b/pjsip/include/pjsip/sip_uri.h index 44124a9d..a6925d96 100644 --- a/pjsip/include/pjsip/sip_uri.h +++ b/pjsip/include/pjsip/sip_uri.h @@ -300,7 +300,8 @@ PJ_INLINE(int) pjsip_uri_print(pjsip_uri_context_e context, const void *uri, char *buf, pj_size_t size) { - return (*((const pjsip_uri*)uri)->vptr->p_print)(context, uri, buf, size); + return (int)(*((const pjsip_uri*)uri)->vptr->p_print)(context, uri, + buf, size); } /** |