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: https://svn.pjsip.org/repos/pjproject/trunk@2861 74dad513-b988-da41-8d7b-12977e46ad98
diff --git a/build.symbian/pjsip_ua.mmp b/build.symbian/pjsip_ua.mmp
index 11b5e9a..5929304 100644
--- a/build.symbian/pjsip_ua.mmp
+++ b/build.symbian/pjsip_ua.mmp
@@ -39,6 +39,7 @@
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 d4701e9..9dc959f 100644
--- a/pjsip/build/Makefile
+++ b/pjsip/build/Makefile
@@ -54,7 +54,7 @@
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 4b6874a..6a7b29f 100644
--- a/pjsip/build/pjsip_ua.dsp
+++ b/pjsip/build/pjsip_ua.dsp
@@ -105,6 +105,10 @@
# 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 @@
# 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 736c00c..53858dc 100644
--- a/pjsip/src/pjsip-ua/sip_inv.c
+++ b/pjsip/src/pjsip-ua/sip_inv.c
@@ -71,7 +71,7 @@
};
/* 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 1200d13..636a8d8 100644
--- a/pjsip/src/pjsip-ua/sip_timer.c
+++ b/pjsip/src/pjsip-ua/sip_timer.c
@@ -66,13 +66,12 @@
/* 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.
*/