Changeset 4598


Ignore:
Timestamp:
Sep 23, 2013 5:03:24 AM (8 years ago)
Author:
bennylp
Message:

More re #1519: fixed some build errors

Location:
pjproject/branches/projects/pjsua2/pjsip
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/projects/pjsua2/pjsip/build/Makefile

    r4597 r4598  
    103103export PJSUA2_TEST_CFLAGS += $(_CFLAGS) $(PJ_VIDEO_CFLAGS) 
    104104export PJSUA2_TEST_CXXFLAGS = $(PJSUA2_LIB_CFLAGS)  
    105 export PJSUA2_TEST_LDFLAGS += -lpjsua2-$(TARGET_NAME) $(PJ_LDFLAGS) $(PJ_LDLIBS) $(LDFLAGS) 
     105export PJSUA2_TEST_LDFLAGS += -lpjsua2-$(TARGET_NAME) -lstdc++ $(PJ_LDFLAGS) $(PJ_LDLIBS) $(LDFLAGS) 
    106106export PJSUA2_TEST_EXE := ../bin/pjsua2-test-$(TARGET_NAME)$(HOST_EXE) 
    107107 
  • pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/endpoint.cpp

    r4597 r4598  
    132132    Endpoint &ep = Endpoint::instance(); 
    133133 
    134     if (!ep.epCallback || !res) 
     134    if (!ep.epCallback) 
    135135        return; 
    136136 
     
    169169    pj_status_t status; 
    170170 
    171     ua_cfg = prmEpConfig.uaConfig.toPjsip(); 
    172     log_cfg = prmEpConfig.logConfig.toPjsip(); 
    173     med_cfg = prmEpConfig.medConfig.toPjsip(); 
     171    ua_cfg = prmEpConfig.uaConfig.toPj(); 
     172    log_cfg = prmEpConfig.logConfig.toPj(); 
     173    med_cfg = prmEpConfig.medConfig.toPj(); 
    174174 
    175175    /* Setup log callback */ 
     
    372372    pj_status_t status; 
    373373 
    374     tcfg = cfg.toPjsip(); 
     374    tcfg = cfg.toPj(); 
    375375    status = pjsua_transport_create(type, &tcfg, &tid); 
    376376    PJSUA2_CHECK_RAISE_ERROR("Endpoint::transportCreate()", status); 
  • pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/types.cpp

    r4597 r4598  
    119119        pua_cfg.stun_srv[i] = str2Pj(this->stunServer[i]); 
    120120    } 
    121     pua_cfg.stun_srv_count = i; 
     121    pua_cfg.stun_srv_cnt = i; 
    122122 
    123123    pua_cfg.nat_type_in_sdp = this->natTypeInSdp; 
Note: See TracChangeset for help on using the changeset viewer.