Changeset 508

Timestamp:

Jun 14, 2006 8:22:31 PM (18 years ago)

Author:

bennylp

Message:

Fixed new pjsua build/makefiles

Location:

pjproject/trunk

Files:

• pjsip-apps/build/Makefile (modified) (1 diff)
• pjsip-apps/build/pjsua.dsp (modified) (1 diff)
• pjsip-apps/src/pjsua/pjsua_app.c (moved) (moved from pjproject/trunk/pjsip-apps/src/pjsua/pjsua.c)
• pjsip/build/Makefile (modified) (1 diff)
• pjsip/src/pjsip/sip_transaction.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_call.c (modified) (2 diffs)

pjproject/trunk/pjsip-apps/build/Makefile

@@ -38 +38 @@
 export PJSUA_SRCDIR = ../src/pjsua
 export PJSUA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
-                        main.o 
+                        main.o pjsua_app.o
 export PJSUA_CFLAGS += $(_CFLAGS)
 export PJSUA_LDFLAGS += $(_LDFLAGS)

pjproject/trunk/pjsip-apps/build/pjsua.dsp

@@ -95 +95 @@
 # Begin Source File
 
-SOURCE=..\src\pjsua\pjsua.c
+SOURCE=..\src\pjsua\pjsua_app.c
 # End Source File
 # End Group

pjproject/trunk/pjsip/build/Makefile

@@ -71 +71 @@
 export PJSUA_LIB_SRCDIR = ../src/pjsua-lib
 export PJSUA_LIB_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
-                        pjsua_call.o pjsua_core.o pjsua_im.o \
-                        pjsua_pres.o pjsua_reg.o pjsua_settings.o \
-                        pjsua_console_app.o
+                        pjsua_acc.o pjsua_call.o pjsua_core.o \
+                        pjsua_im.o pjsua_media.o pjsua_pres.o
 export PJSUA_LIB_CFLAGS += $(_CFLAGS)
 

pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

@@ -1329 +1329 @@
  * Set transaction status code and reason.
  */
-static tsx_set_status_code(pjsip_transaction *tsx,
-                           int code, const pj_str_t *reason)
+static void tsx_set_status_code(pjsip_transaction *tsx,
+                                int code, const pj_str_t *reason)
 {
     tsx->status_code = code;

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

@@ -1260 +1260 @@
                   "%s  #%d %.*s @%dKHz, %s, peer=%s:%d",
                   indent, i,
-                  info.stream_info[i].fmt.encoding_name.slen,
+                  (int)info.stream_info[i].fmt.encoding_name.slen,
                   info.stream_info[i].fmt.encoding_name.ptr,
                   info.stream_info[i].fmt.clock_rate / 1000,
@@ -1503 +1503 @@
                            "1st res in %d ms, conn in %dms",
                            indent,
-                           (duration.sec / 3600),
-                           ((duration.sec % 3600)/60),
-                           (duration.sec % 60),
-                           PJ_TIME_VAL_MSEC(res_delay), 
-                           PJ_TIME_VAL_MSEC(con_delay));
+                           (int)(duration.sec / 3600),
+                           (int)((duration.sec % 3600)/60),
+                           (int)(duration.sec % 60),
+                           (int)PJ_TIME_VAL_MSEC(res_delay), 
+                           (int)PJ_TIME_VAL_MSEC(con_delay));
     
     if (len > 0 && len < end-p) {