Changeset 4598 for pjproject

Timestamp:

Sep 23, 2013 5:03:24 AM (11 years ago)

Author:

bennylp

Message:

More re #1519: fixed some build errors

Location:

pjproject/branches/projects/pjsua2/pjsip

Files:

• build/Makefile (modified) (1 diff)
• src/pjsua2/endpoint.cpp (modified) (3 diffs)
• src/pjsua2/types.cpp (modified) (1 diff)

pjproject/branches/projects/pjsua2/pjsip/build/Makefile

@@ -103 +103 @@
 export PJSUA2_TEST_CFLAGS += $(_CFLAGS) $(PJ_VIDEO_CFLAGS)
 export PJSUA2_TEST_CXXFLAGS = $(PJSUA2_LIB_CFLAGS) 
-export PJSUA2_TEST_LDFLAGS += -lpjsua2-$(TARGET_NAME) $(PJ_LDFLAGS) $(PJ_LDLIBS) $(LDFLAGS)
+export PJSUA2_TEST_LDFLAGS += -lpjsua2-$(TARGET_NAME) -lstdc++ $(PJ_LDFLAGS) $(PJ_LDLIBS) $(LDFLAGS)
 export PJSUA2_TEST_EXE := ../bin/pjsua2-test-$(TARGET_NAME)$(HOST_EXE)
 

pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/endpoint.cpp

@@ -132 +132 @@
     Endpoint &ep = Endpoint::instance();
 
-    if (!ep.epCallback || !res)
+    if (!ep.epCallback)
         return;
 
@@ -169 +169 @@
     pj_status_t status;
 
-    ua_cfg = prmEpConfig.uaConfig.toPjsip();
-    log_cfg = prmEpConfig.logConfig.toPjsip();
-    med_cfg = prmEpConfig.medConfig.toPjsip();
+    ua_cfg = prmEpConfig.uaConfig.toPj();
+    log_cfg = prmEpConfig.logConfig.toPj();
+    med_cfg = prmEpConfig.medConfig.toPj();
 
     /* Setup log callback */
@@ -372 +372 @@
     pj_status_t status;
 
-    tcfg = cfg.toPjsip();
+    tcfg = cfg.toPj();
     status = pjsua_transport_create(type, &tcfg, &tid);
     PJSUA2_CHECK_RAISE_ERROR("Endpoint::transportCreate()", status);

pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/types.cpp

@@ -119 +119 @@
         pua_cfg.stun_srv[i] = str2Pj(this->stunServer[i]);
     }
-    pua_cfg.stun_srv_count = i;
+    pua_cfg.stun_srv_cnt = i;
 
     pua_cfg.nat_type_in_sdp = this->natTypeInSdp;