diff options
| -rw-r--r-- | pjlib/src/pj/lock.c | 9 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia/BladeMP3EncDLL.h | 5 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia/echo_speex.c | 1 | ||||
| -rw-r--r-- | pjsip-apps/src/pjsua/pjsua_app.c | 2 | ||||
| -rw-r--r-- | pjsip-apps/src/samples/siprtp.c | 5 | ||||
| -rw-r--r-- | pjsip/src/pjsip/sip_dialog.c | 2 | ||||
| -rw-r--r-- | pjsip/src/test-pjsip/msg_test.c | 2 |
7 files changed, 16 insertions, 10 deletions
diff --git a/pjlib/src/pj/lock.c b/pjlib/src/pj/lock.c index 65de868e..fb8dca7d 100644 --- a/pjlib/src/pj/lock.c +++ b/pjlib/src/pj/lock.c @@ -59,6 +59,7 @@ static pj_status_t create_mutex_lock( pj_pool_t *pool, pj_lock_t **lock ) { pj_lock_t *p_lock; + pj_mutex_t *mutex; pj_status_t rc; PJ_ASSERT_RETURN(pool && lock, PJ_EINVAL); @@ -68,10 +69,11 @@ static pj_status_t create_mutex_lock( pj_pool_t *pool, return PJ_ENOMEM; pj_memcpy(p_lock, &mutex_lock_template, sizeof(pj_lock_t)); - rc = pj_mutex_create(pool, name, type, (pj_mutex_t**)&p_lock->lock_object); + rc = pj_mutex_create(pool, name, type, &mutex); if (rc != PJ_SUCCESS) return rc; + p_lock->lock_object = mutex; *lock = p_lock; return PJ_SUCCESS; } @@ -145,6 +147,7 @@ PJ_DEF(pj_status_t) pj_lock_create_semaphore( pj_pool_t *pool, pj_lock_t **lock ) { pj_lock_t *p_lock; + pj_sem_t *sem; pj_status_t rc; PJ_ASSERT_RETURN(pool && lock, PJ_EINVAL); @@ -154,11 +157,11 @@ PJ_DEF(pj_status_t) pj_lock_create_semaphore( pj_pool_t *pool, return PJ_ENOMEM; pj_memcpy(p_lock, &sem_lock_template, sizeof(pj_lock_t)); - rc = pj_sem_create( pool, name, initial, max, - (pj_sem_t**)&p_lock->lock_object); + rc = pj_sem_create( pool, name, initial, max, &sem); if (rc != PJ_SUCCESS) return rc; + p_lock->lock_object = sem; *lock = p_lock; return PJ_SUCCESS; diff --git a/pjmedia/src/pjmedia/BladeMP3EncDLL.h b/pjmedia/src/pjmedia/BladeMP3EncDLL.h index 2fa92b5e..2e32b913 100644 --- a/pjmedia/src/pjmedia/BladeMP3EncDLL.h +++ b/pjmedia/src/pjmedia/BladeMP3EncDLL.h @@ -26,7 +26,8 @@ #define ___BLADEDLL_H_INCLUDED___ #ifdef __GNUC__ -#define ATTRIBUTE_PACKED __attribute__((packed)) +//#define ATTRIBUTE_PACKED __attribute__((packed)) +#define ATTRIBUTE_PACKED #else #define ATTRIBUTE_PACKED #pragma pack(push) @@ -241,7 +242,7 @@ typedef unsigned long (*BEENCODECHUNKFLOATS16NI) (HBE_STREAM, unsigned long, flo typedef unsigned long (*BEDEINITSTREAM) (HBE_STREAM, unsigned char *, unsigned long *); typedef unsigned long (*BECLOSESTREAM) (HBE_STREAM); typedef void (*BEVERSION) (PBE_VERSION); -typedef unsigned long (*BEWRITEVBRHEADER) (LPCSTR); +typedef unsigned long (*BEWRITEVBRHEADER) (const char*); typedef unsigned long (*BEWRITEINFOTAG) (HBE_STREAM, const char * ); #define TEXT_BEINITSTREAM "beInitStream" diff --git a/pjmedia/src/pjmedia/echo_speex.c b/pjmedia/src/pjmedia/echo_speex.c index 187a5e29..08c30fa7 100644 --- a/pjmedia/src/pjmedia/echo_speex.c +++ b/pjmedia/src/pjmedia/echo_speex.c @@ -573,4 +573,3 @@ PJ_DEF(pj_status_t) speex_aec_cancel_echo( void *state, } -
\ No newline at end of file diff --git a/pjsip-apps/src/pjsua/pjsua_app.c b/pjsip-apps/src/pjsua/pjsua_app.c index ac469767..9605cdea 100644 --- a/pjsip-apps/src/pjsua/pjsua_app.c +++ b/pjsip-apps/src/pjsua/pjsua_app.c @@ -1114,7 +1114,7 @@ static int write_settings(const struct app_config *config, if (config->udp_cfg.tls_setting.timeout.sec) { pj_ansi_sprintf(line, "--tls-neg-timeout %d\n", - config->udp_cfg.tls_setting.timeout.sec); + (int)config->udp_cfg.tls_setting.timeout.sec); pj_strcat2(&cfg, line); } diff --git a/pjsip-apps/src/samples/siprtp.c b/pjsip-apps/src/samples/siprtp.c index 65b71608..208ac84f 100644 --- a/pjsip-apps/src/samples/siprtp.c +++ b/pjsip-apps/src/samples/siprtp.c @@ -1278,6 +1278,7 @@ static int media_thread(void *arg) * Time to send RTP packet. */ pj_status_t status; + const void *p_hdr; const pjmedia_rtp_hdr *hdr; pj_ssize_t size; int hdrlen; @@ -1287,10 +1288,12 @@ static int media_thread(void *arg) 0, /* marker bit */ strm->bytes_per_frame, strm->samples_per_frame, - (const void**)&hdr, &hdrlen); + &p_hdr, &hdrlen); if (status == PJ_SUCCESS) { //PJ_LOG(4,(THIS_FILE, "\t\tTx seq=%d", pj_ntohs(hdr->seq))); + + hdr = (const pjmedia_rtp_hdr*) p_hdr; /* Copy RTP header to packet */ pj_memcpy(packet, hdr, hdrlen); diff --git a/pjsip/src/pjsip/sip_dialog.c b/pjsip/src/pjsip/sip_dialog.c index 7858f086..59fda231 100644 --- a/pjsip/src/pjsip/sip_dialog.c +++ b/pjsip/src/pjsip/sip_dialog.c @@ -454,7 +454,7 @@ PJ_DEF(pj_status_t) pjsip_dlg_create_uas( pjsip_user_agent *ua, /* Find next Record-Route header. */ rr = rr->next; - if (rr == (pjsip_rr_hdr*)&rdata->msg_info.msg->hdr) + if (rr == (void*)&rdata->msg_info.msg->hdr) break; rr = pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_RECORD_ROUTE, rr); } diff --git a/pjsip/src/test-pjsip/msg_test.c b/pjsip/src/test-pjsip/msg_test.c index 6954f015..4a27ca84 100644 --- a/pjsip/src/test-pjsip/msg_test.c +++ b/pjsip/src/test-pjsip/msg_test.c @@ -112,7 +112,7 @@ static struct static pj_status_t test_entry( pj_pool_t *pool, struct test_msg *entry ) { - pjsip_msg *parsed_msg, *ref_msg; + pjsip_msg *parsed_msg, *ref_msg = NULL; static pjsip_msg *print_msg; pj_status_t status = PJ_SUCCESS; int len; |