Ticket #354: continuing work to port the Symbian libraries to .DSO format

git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@1417 74dad513-b988-da41-8d7b-12977e46ad98
diff --git a/pjsip/src/pjsip-simple/evsub_msg.c b/pjsip/src/pjsip-simple/evsub_msg.c
index 467345d..19058b1 100644
--- a/pjsip/src/pjsip-simple/evsub_msg.c
+++ b/pjsip/src/pjsip-simple/evsub_msg.c
@@ -61,6 +61,7 @@
     char *p = buf;
     char *endbuf = buf+size;
     int printed;
+    const pjsip_parser_const_t *pc = pjsip_parser_const();
 
     copy_advance(p, hdr->name);
     *p++ = ':';
@@ -70,8 +71,8 @@
     copy_advance_pair(p, ";id=", 4, hdr->id_param);
     
     printed = pjsip_param_print_on(&hdr->other_param, p, endbuf-p,
-				   &pjsip_TOKEN_SPEC, 
-				   &pjsip_TOKEN_SPEC, ';');
+				   &pc->pjsip_TOKEN_SPEC, 
+				   &pc->pjsip_TOKEN_SPEC, ';');
     if (printed < 0)
 	return printed;
 
@@ -159,6 +160,7 @@
     char *p = buf;
     char *endbuf = buf+size;
     int printed;
+    const pjsip_parser_const_t *pc = pjsip_parser_const();
 
     copy_advance(p, hdr->name);
     *p++ = ':';
@@ -180,8 +182,8 @@
     }
     
     printed = pjsip_param_print_on( &hdr->other_param, p, endbuf-p, 
-				    &pjsip_TOKEN_SPEC,
-				    &pjsip_TOKEN_SPEC,
+				    &pc->pjsip_TOKEN_SPEC,
+				    &pc->pjsip_TOKEN_SPEC,
 				    ';');
     if (printed < 0)
 	return printed;
@@ -222,8 +224,9 @@
 {
     pjsip_event_hdr *hdr = pjsip_event_hdr_create(ctx->pool);
     const pj_str_t id_param = { "id", 2 };
+    const pjsip_parser_const_t *pc = pjsip_parser_const();
 
-    pj_scan_get(ctx->scanner, &pjsip_TOKEN_SPEC, &hdr->event_type);
+    pj_scan_get(ctx->scanner, &pc->pjsip_TOKEN_SPEC, &hdr->event_type);
 
     while (*ctx->scanner->curptr == ';') {
 	pj_str_t pname, pvalue;
@@ -253,7 +256,9 @@
     const pj_str_t reason = { "reason", 6 },
 		   expires = { "expires", 7 },
 		   retry_after = { "retry-after", 11 };
-    pj_scan_get(ctx->scanner, &pjsip_TOKEN_SPEC, &hdr->sub_state);
+    const pjsip_parser_const_t *pc = pjsip_parser_const();
+
+    pj_scan_get(ctx->scanner, &pc->pjsip_TOKEN_SPEC, &hdr->sub_state);
 
     while (*ctx->scanner->curptr == ';') {
 	pj_str_t pname, pvalue;