Changeset 4598
- Timestamp:
- Sep 23, 2013 5:03:24 AM (11 years ago)
- Location:
- pjproject/branches/projects/pjsua2/pjsip
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/branches/projects/pjsua2/pjsip/build/Makefile
r4597 r4598 103 103 export PJSUA2_TEST_CFLAGS += $(_CFLAGS) $(PJ_VIDEO_CFLAGS) 104 104 export PJSUA2_TEST_CXXFLAGS = $(PJSUA2_LIB_CFLAGS) 105 export PJSUA2_TEST_LDFLAGS += -lpjsua2-$(TARGET_NAME) $(PJ_LDFLAGS) $(PJ_LDLIBS) $(LDFLAGS)105 export PJSUA2_TEST_LDFLAGS += -lpjsua2-$(TARGET_NAME) -lstdc++ $(PJ_LDFLAGS) $(PJ_LDLIBS) $(LDFLAGS) 106 106 export PJSUA2_TEST_EXE := ../bin/pjsua2-test-$(TARGET_NAME)$(HOST_EXE) 107 107 -
pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/endpoint.cpp
r4597 r4598 132 132 Endpoint &ep = Endpoint::instance(); 133 133 134 if (!ep.epCallback || !res)134 if (!ep.epCallback) 135 135 return; 136 136 … … 169 169 pj_status_t status; 170 170 171 ua_cfg = prmEpConfig.uaConfig.toPj sip();172 log_cfg = prmEpConfig.logConfig.toPj sip();173 med_cfg = prmEpConfig.medConfig.toPj sip();171 ua_cfg = prmEpConfig.uaConfig.toPj(); 172 log_cfg = prmEpConfig.logConfig.toPj(); 173 med_cfg = prmEpConfig.medConfig.toPj(); 174 174 175 175 /* Setup log callback */ … … 372 372 pj_status_t status; 373 373 374 tcfg = cfg.toPj sip();374 tcfg = cfg.toPj(); 375 375 status = pjsua_transport_create(type, &tcfg, &tid); 376 376 PJSUA2_CHECK_RAISE_ERROR("Endpoint::transportCreate()", status); -
pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/types.cpp
r4597 r4598 119 119 pua_cfg.stun_srv[i] = str2Pj(this->stunServer[i]); 120 120 } 121 pua_cfg.stun_srv_c ount = i;121 pua_cfg.stun_srv_cnt = i; 122 122 123 123 pua_cfg.nat_type_in_sdp = this->natTypeInSdp;
Note: See TracChangeset
for help on using the changeset viewer.