Ignore:
Timestamp:
Nov 22, 2017 6:59:47 AM (3 years ago)
Author:
riza
Message:

Close #2067: Fix linker error when building as dll on VS2015.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjsip/src/pjsip/sip_msg.c

    r5468 r5701  
    145145}; 
    146146 
    147 pj_bool_t pjsip_use_compact_form = PJSIP_ENCODE_SHORT_HNAME; 
    148  
    149147static pj_str_t status_phrase[710]; 
    150148static int print_media_type(char *buf, unsigned len, 
     
    404402    pj_str_t clen_hdr =  { "Content-Length: ", 16}; 
    405403 
    406     if (pjsip_use_compact_form) { 
     404    if (pjsip_cfg()->endpt.use_compact_form) { 
    407405        clen_hdr.ptr = "l: "; 
    408406        clen_hdr.slen = 3; 
     
    487485            const pjsip_media_type *media = &msg->body->content_type; 
    488486 
    489             if (pjsip_use_compact_form) { 
     487            if (pjsip_cfg()->endpt.use_compact_form) { 
    490488                ctype_hdr.ptr = "c: "; 
    491489                ctype_hdr.slen = 3; 
     
    750748{ 
    751749    char *p = buf; 
    752     const pj_str_t *hname = pjsip_use_compact_form? &hdr->sname : &hdr->name; 
     750    const pj_str_t *hname = pjsip_cfg()->endpt.use_compact_form?  
     751                            &hdr->sname : &hdr->name; 
    753752     
    754753    if ((pj_ssize_t)size < hname->slen + hdr->hvalue.slen + 5) 
     
    833832{ 
    834833    char *p = buf; 
    835     const pj_str_t *hname = pjsip_use_compact_form? &hdr->sname : &hdr->name; 
     834    const pj_str_t *hname = pjsip_cfg()->endpt.use_compact_form?  
     835                            &hdr->sname : &hdr->name; 
    836836 
    837837    if ((pj_ssize_t)size < hname->slen + 15) 
     
    909909{ 
    910910    char *p = buf, *endbuf = buf+size; 
    911     const pj_str_t *hname = pjsip_use_compact_form? &hdr->sname : &hdr->name; 
     911    const pj_str_t *hname = pjsip_cfg()->endpt.use_compact_form?  
     912                            &hdr->sname : &hdr->name; 
    912913 
    913914    copy_advance(p, (*hname)); 
     
    10581059    char *p = buf; 
    10591060    int len; 
    1060     const pj_str_t *hname = pjsip_use_compact_form? &hdr->sname : &hdr->name; 
     1061    const pj_str_t *hname = pjsip_cfg()->endpt.use_compact_form?  
     1062                            &hdr->sname : &hdr->name; 
    10611063 
    10621064    if ((pj_ssize_t)size < hname->slen + 14) 
     
    12011203                                    pj_size_t size) 
    12021204{ 
    1203     const pj_str_t *hname = pjsip_use_compact_form? &hdr->sname : &hdr->name; 
     1205    const pj_str_t *hname = pjsip_cfg()->endpt.use_compact_form?  
     1206                            &hdr->sname : &hdr->name; 
    12041207    const pjsip_parser_const_t *pc = pjsip_parser_const(); 
    12051208 
     
    13751378    char *p = buf; 
    13761379    int len; 
    1377     const pj_str_t *hname = pjsip_use_compact_form? &hdr->sname : &hdr->name; 
     1380    const pj_str_t *hname = pjsip_cfg()->endpt.use_compact_form?  
     1381                            &hdr->sname : &hdr->name; 
    13781382 
    13791383    if ((pj_ssize_t)size < hname->slen +  
     
    15151519    char *startbuf = buf; 
    15161520    char *endbuf = buf + size; 
    1517     const pj_str_t *hname = pjsip_use_compact_form? &hdr->sname : &hdr->name; 
     1521    const pj_str_t *hname = pjsip_cfg()->endpt.use_compact_form?  
     1522                            &hdr->sname : &hdr->name; 
    15181523    const pjsip_parser_const_t *pc = pjsip_parser_const(); 
    15191524 
     
    19851990    char *endbuf = buf + size; 
    19861991    pj_str_t sip_ver = { "SIP/2.0/", 8 }; 
    1987     const pj_str_t *hname = pjsip_use_compact_form? &hdr->sname : &hdr->name; 
     1992    const pj_str_t *hname = pjsip_cfg()->endpt.use_compact_form?  
     1993                            &hdr->sname : &hdr->name; 
    19881994    const pjsip_parser_const_t *pc = pjsip_parser_const(); 
    19891995 
Note: See TracChangeset for help on using the changeset viewer.