Changeset 2861


Ignore:
Timestamp:
Aug 11, 2009 6:21:13 PM (10 years ago)
Author:
nanang
Message:

Ticket #833:

  • Updated build config for VS6, Symbian, and Makefile for Session Timer.
  • Fixed C/C++ cross-linking problem on some compilers (e.g: Symbian GCCE).
Location:
pjproject/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/build.symbian/pjsip_ua.mmp

    r2768 r2861  
    4040SOURCE  sip_xfer.c 
    4141SOURCE  sip_100rel.c 
     42SOURCE  sip_timer.c 
    4243 
    4344SYSTEMINCLUDE   ..\pjlib\include  
  • pjproject/trunk/pjsip/build/Makefile

    r2663 r2861  
    5555export PJSIP_UA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ 
    5656                        sip_inv.o sip_reg.o sip_replaces.o sip_xfer.o \ 
    57                         sip_100rel.o 
     57                        sip_100rel.o sip_timer.o 
    5858export PJSIP_UA_CFLAGS += $(_CFLAGS) 
    5959 
  • pjproject/trunk/pjsip/build/pjsip_ua.dsp

    r1463 r2861  
    106106# Begin Source File 
    107107 
     108SOURCE="..\src\pjsip-ua\sip_timer.c" 
     109# End Source File 
     110# Begin Source File 
     111 
    108112SOURCE="..\src\pjsip-ua\sip_xfer.c" 
    109113# End Source File 
     
    134138# Begin Source File 
    135139 
     140SOURCE="..\include\pjsip-ua\sip_timer.h" 
     141# End Source File 
     142# Begin Source File 
     143 
    136144SOURCE="..\include\pjsip-ua\sip_xfer.h" 
    137145# End Source File 
  • pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

    r2859 r2861  
    7272 
    7373/* UPDATE method */ 
    74 const pjsip_method pjsip_update_method = 
     74static const pjsip_method pjsip_update_method = 
    7575{ 
    7676    PJSIP_OTHER_METHOD, 
  • pjproject/trunk/pjsip/src/pjsip-ua/sip_timer.c

    r2859 r2861  
    6767/* External global vars */ 
    6868extern pj_bool_t pjsip_use_compact_form; 
    69 extern const pjsip_method pjsip_update_method; 
    7069 
    7170/* Local functions & vars */ 
     
    7372static void start_timer(pjsip_inv_session *inv); 
    7473static pj_bool_t is_initialized; 
    75  
     74const pjsip_method pjsip_update_method = { PJSIP_OTHER_METHOD, {"UPDATE", 6}}; 
    7675/* 
    7776 * Session-Expires header vptr. 
Note: See TracChangeset for help on using the changeset viewer.