Ignore:
Timestamp:
May 11, 2007 3:14:34 PM (14 years ago)
Author:
bennylp
Message:

HUGE changeset to make the rest of the libraries compile with C++ mode

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjmedia/src/pjmedia/endpoint.c

    r1103 r1266  
    127127        return PJ_ENOMEM; 
    128128 
    129     endpt = pj_pool_zalloc(pool, sizeof(struct pjmedia_endpt)); 
     129    endpt = PJ_POOL_ZALLOC_T(pool, struct pjmedia_endpt); 
    130130    endpt->pool = pool; 
    131131    endpt->pf = pf; 
     
    247247static int PJ_THREAD_FUNC worker_proc(void *arg) 
    248248{ 
    249     pjmedia_endpt *endpt = arg; 
     249    pjmedia_endpt *endpt = (pjmedia_endpt*) arg; 
    250250 
    251251    while (!endpt->quit_flag) { 
     
    294294 
    295295    /* Create and initialize basic SDP session */ 
    296     sdp = pj_pool_zalloc (pool, sizeof(pjmedia_sdp_session)); 
     296    sdp = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_session); 
    297297 
    298298    pj_gettimeofday(&tv); 
     
    308308     * SDP connection line in the session level. 
    309309     */ 
    310     sdp->conn = pj_pool_zalloc (pool, sizeof(pjmedia_sdp_conn)); 
     310    sdp->conn = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_conn); 
    311311    sdp->conn->net_type = STR_IN; 
    312312    sdp->conn->addr_type = STR_IP4; 
     
    322322 
    323323    sdp->media_count = 1; 
    324     m = pj_pool_zalloc (pool, sizeof(pjmedia_sdp_media)); 
     324    m = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_media); 
    325325    sdp->media[0] = m; 
    326326 
     
    338338#if defined(PJMEDIA_HAS_RTCP_IN_SDP) && PJMEDIA_HAS_RTCP_IN_SDP!=0 
    339339    if (sock_info->rtcp_addr_name.sin_family != 0) { 
    340         attr = pj_pool_alloc(pool, sizeof(pjmedia_sdp_attr)); 
     340        attr = PJ_POOL_ALLOC_T(pool, pjmedia_sdp_attr); 
    341341        attr->name = pj_str("rtcp"); 
    342         attr->value.ptr = pj_pool_alloc(pool, 80); 
     342        attr->value.ptr = (char*) pj_pool_alloc(pool, 80); 
    343343        attr->value.slen =  
    344344            pj_ansi_snprintf(attr->value.ptr, 80, 
     
    368368        fmt = &m->desc.fmt[m->desc.fmt_count++]; 
    369369 
    370         fmt->ptr = pj_pool_alloc(pool, 8); 
     370        fmt->ptr = (char*) pj_pool_alloc(pool, 8); 
    371371        fmt->slen = pj_utoa(codec_info->pt, fmt->ptr); 
    372372 
     
    400400        if (codec_param.setting.dec_fmtp_mode != 0) { 
    401401            const pj_str_t fmtp = { "fmtp", 4 }; 
    402             attr = pj_pool_zalloc(pool, sizeof(pjmedia_sdp_attr)); 
     402            attr = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_attr); 
    403403 
    404404            attr->name = fmtp; 
    405             attr->value.ptr = pj_pool_alloc(pool, 32); 
     405            attr->value.ptr = (char*) pj_pool_alloc(pool, 32); 
    406406            attr->value.slen =  
    407407                pj_ansi_snprintf( attr->value.ptr, 32, 
     
    414414 
    415415    /* Add sendrecv attribute. */ 
    416     attr = pj_pool_zalloc(pool, sizeof(pjmedia_sdp_attr)); 
     416    attr = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_attr); 
    417417    attr->name = STR_SENDRECV; 
    418418    m->attr[m->attr_count++] = attr; 
     
    428428 
    429429    /* Add rtpmap. */ 
    430     attr = pj_pool_zalloc(pool, sizeof(pjmedia_sdp_attr)); 
     430    attr = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_attr); 
    431431    attr->name = pj_str("rtpmap"); 
    432432    attr->value = pj_str(PJMEDIA_RTP_PT_TELEPHONE_EVENTS_STR  
     
    435435 
    436436    /* Add fmtp */ 
    437     attr = pj_pool_zalloc(pool, sizeof(pjmedia_sdp_attr)); 
     437    attr = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_attr); 
    438438    attr->name = pj_str("fmtp"); 
    439439    attr->value = pj_str(PJMEDIA_RTP_PT_TELEPHONE_EVENTS_STR " 0-15"); 
Note: See TracChangeset for help on using the changeset viewer.