Misc (re #1446): Fixed compile errors on Symbian S60 5th Ed SDK: unrecognized a struct defined inside another struct and 64 bit integer constants suffix.

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4099 74dad513-b988-da41-8d7b-12977e46ad98

4 files changed, 16 insertions, 12 deletions

diff --git a/pjmedia/src/pjmedia/clock_thread.c b/pjmedia/src/pjmedia/clock_thread.c
index 39a77fa2..0ce78368 100644
--- a/pjmedia/src/pjmedia/clock_thread.c
+++ b/pjmedia/src/pjmedia/clock_thread.c
@@ -83,7 +83,7 @@ pjmedia_clock_src_get_time_msec( const pjmedia_clock_src *clocksrc )
     pjmedia_clock_src_get_current_timestamp(clocksrc, &ts);
 
 #if PJ_HAS_INT64
-    if (ts.u64 > 0x3FFFFFFFFFFFFFUL)
+    if (ts.u64 > 0x3FFFFFFFFFFFFFULL)
         return (pj_uint32_t)(ts.u64 / clocksrc->clock_rate * 1000);
     else
         return (pj_uint32_t)(ts.u64 * 1000 / clocksrc->clock_rate);
diff --git a/pjmedia/src/pjmedia/vid_stream.c b/pjmedia/src/pjmedia/vid_stream.c
index 1ce8185a..a1dc4e00 100644
--- a/pjmedia/src/pjmedia/vid_stream.c
+++ b/pjmedia/src/pjmedia/vid_stream.c
@@ -468,7 +468,7 @@ static pj_status_t send_rtcp(pjmedia_vid_stream *stream,
 	pj_memcpy(pkt, sr_rr_pkt, len);
 	max_len = stream->out_rtcp_pkt_size;
     } else {
-	pkt = sr_rr_pkt;
+	pkt = (pj_uint8_t*)sr_rr_pkt;
 	max_len = len;
     }
 
diff --git a/pjsip/include/pjsua-lib/pjsua_internal.h b/pjsip/include/pjsua-lib/pjsua_internal.h
index 61007d8a..ac4ab31f 100644
--- a/pjsip/include/pjsua-lib/pjsua_internal.h
+++ b/pjsip/include/pjsua-lib/pjsua_internal.h
@@ -361,6 +361,16 @@ typedef struct pjsua_vid_win
     pj_bool_t			 is_native; 	/**< Preview is by dev  */
 } pjsua_vid_win;
 
+
+typedef struct pjsua_timer_list
+{
+    PJ_DECL_LIST_MEMBER(struct pjsua_timer_list);
+    pj_timer_entry         entry;
+    void                  (*cb)(void *user_data);
+    void                   *user_data;
+} pjsua_timer_list;
+
+
 /**
  * Global pjsua application data.
  */
@@ -463,13 +473,7 @@ struct pjsua_data
 #endif
 
     /* Timer entry list */
-    struct timer_list
-    {
-        PJ_DECL_LIST_MEMBER(struct timer_list);
-        pj_timer_entry          entry;
-        void                  (*cb)(void *user_data);
-        void                   *user_data;
-    } timer_list;
+    pjsua_timer_list	 timer_list;
     pj_mutex_t          *timer_mutex;
 };
 
diff --git a/pjsip/src/pjsua-lib/pjsua_core.c b/pjsip/src/pjsua-lib/pjsua_core.c
index 266dd09f..02809efb 100644
--- a/pjsip/src/pjsua-lib/pjsua_core.c
+++ b/pjsip/src/pjsua-lib/pjsua_core.c
@@ -2629,7 +2629,7 @@ PJ_DEF(pj_status_t) pjsua_schedule_timer( pj_timer_entry *entry,
 static void timer_cb( pj_timer_heap_t *th,
 		      pj_timer_entry *entry)
 {
-    struct timer_list *tmr = (struct timer_list *)entry->user_data;
+    pjsua_timer_list *tmr = (pjsua_timer_list *)entry->user_data;
     void (*cb)(void *user_data) = tmr->cb;
     void *user_data = tmr->user_data;
 
@@ -2650,14 +2650,14 @@ PJ_DEF(pj_status_t) pjsua_schedule_timer2( void (*cb)(void *user_data),
                                            void *user_data,
                                            unsigned msec_delay)
 {
-    struct timer_list *tmr = NULL;
+    pjsua_timer_list *tmr = NULL;
     pj_status_t status;
     pj_time_val delay;
 
     pj_mutex_lock(pjsua_var.timer_mutex);
 
     if (pj_list_empty(&pjsua_var.timer_list)) {
-        tmr = PJ_POOL_ALLOC_T(pjsua_var.pool, struct timer_list);
+        tmr = PJ_POOL_ALLOC_T(pjsua_var.pool, pjsua_timer_list);
     } else {
         tmr = pjsua_var.timer_list.next;
         pj_list_erase(tmr);