diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2009-08-11 18:21:13 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2009-08-11 18:21:13 +0000 |
| commit | 02ee2764e377af337bfab2516f663dd0f518e806 (patch) | |
| tree | 9a540e358e5a7f7c45d4ef8a579a972c4425fd4b | |
| parent | 26a5fb73f80c12b533750d903e0722489bee02ad (diff) | |
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).
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2861 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | build.symbian/pjsip_ua.mmp | 1 | ||||
| -rw-r--r-- | pjsip/build/Makefile | 2 | ||||
| -rw-r--r-- | pjsip/build/pjsip_ua.dsp | 8 | ||||
| -rw-r--r-- | pjsip/src/pjsip-ua/sip_inv.c | 2 | ||||
| -rw-r--r-- | pjsip/src/pjsip-ua/sip_timer.c | 3 |
5 files changed, 12 insertions, 4 deletions
diff --git a/build.symbian/pjsip_ua.mmp b/build.symbian/pjsip_ua.mmp index 11b5e9a7..59293049 100644 --- a/build.symbian/pjsip_ua.mmp +++ b/build.symbian/pjsip_ua.mmp @@ -39,6 +39,7 @@ SOURCE sip_reg.c SOURCE sip_replaces.c SOURCE sip_xfer.c SOURCE sip_100rel.c +SOURCE sip_timer.c SYSTEMINCLUDE ..\pjlib\include SYSTEMINCLUDE ..\pjlib-util\include diff --git a/pjsip/build/Makefile b/pjsip/build/Makefile index d4701e9f..9dc959f3 100644 --- a/pjsip/build/Makefile +++ b/pjsip/build/Makefile @@ -54,7 +54,7 @@ export PJSIP_CFLAGS += $(_CFLAGS) export PJSIP_UA_SRCDIR = ../src/pjsip-ua export PJSIP_UA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ sip_inv.o sip_reg.o sip_replaces.o sip_xfer.o \ - sip_100rel.o + sip_100rel.o sip_timer.o export PJSIP_UA_CFLAGS += $(_CFLAGS) diff --git a/pjsip/build/pjsip_ua.dsp b/pjsip/build/pjsip_ua.dsp index 4b6874a3..6a7b29f5 100644 --- a/pjsip/build/pjsip_ua.dsp +++ b/pjsip/build/pjsip_ua.dsp @@ -105,6 +105,10 @@ SOURCE="..\src\pjsip-ua\sip_replaces.c" # End Source File
# Begin Source File
+SOURCE="..\src\pjsip-ua\sip_timer.c"
+# End Source File
+# Begin Source File
+
SOURCE="..\src\pjsip-ua\sip_xfer.c"
# End Source File
# End Group
@@ -133,6 +137,10 @@ SOURCE="..\include\pjsip-ua\sip_replaces.h" # End Source File
# Begin Source File
+SOURCE="..\include\pjsip-ua\sip_timer.h"
+# End Source File
+# Begin Source File
+
SOURCE="..\include\pjsip-ua\sip_xfer.h"
# End Source File
# End Group
diff --git a/pjsip/src/pjsip-ua/sip_inv.c b/pjsip/src/pjsip-ua/sip_inv.c index 736c00c9..53858dcd 100644 --- a/pjsip/src/pjsip-ua/sip_inv.c +++ b/pjsip/src/pjsip-ua/sip_inv.c @@ -71,7 +71,7 @@ static const char *inv_state_names[] = }; /* UPDATE method */ -const pjsip_method pjsip_update_method = +static const pjsip_method pjsip_update_method = { PJSIP_OTHER_METHOD, { "UPDATE", 6 } diff --git a/pjsip/src/pjsip-ua/sip_timer.c b/pjsip/src/pjsip-ua/sip_timer.c index 1200d133..636a8d8f 100644 --- a/pjsip/src/pjsip-ua/sip_timer.c +++ b/pjsip/src/pjsip-ua/sip_timer.c @@ -66,13 +66,12 @@ typedef struct pjsip_timer /* External global vars */ extern pj_bool_t pjsip_use_compact_form; -extern const pjsip_method pjsip_update_method; /* Local functions & vars */ static void stop_timer(pjsip_inv_session *inv); static void start_timer(pjsip_inv_session *inv); static pj_bool_t is_initialized; - +const pjsip_method pjsip_update_method = { PJSIP_OTHER_METHOD, {"UPDATE", 6}}; /* * Session-Expires header vptr. */ |