Changeset 4099 for pjproject

Timestamp:

Apr 26, 2012 4:46:27 PM (13 years ago)

Author:

nanang

Message:

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.

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia/clock_thread.c (modified) (1 diff)
• pjmedia/src/pjmedia/vid_stream.c (modified) (1 diff)
• pjsip/include/pjsua-lib/pjsua_internal.h (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (3 diffs)

pjproject/trunk/pjmedia/src/pjmedia/clock_thread.c

@@ -84 +84 @@
 
 #if PJ_HAS_INT64
-    if (ts.u64 > 0x3FFFFFFFFFFFFFUL)
+    if (ts.u64 > 0x3FFFFFFFFFFFFFULL)
         return (pj_uint32_t)(ts.u64 / clocksrc->clock_rate * 1000);
     else

pjproject/trunk/pjmedia/src/pjmedia/vid_stream.c

@@ -469 +469 @@
         max_len = stream->out_rtcp_pkt_size;
     } else {
-        pkt = sr_rr_pkt;
+        pkt = (pj_uint8_t*)sr_rr_pkt;
         max_len = len;
     }

pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h

@@ -362 +362 @@
 } 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.
@@ -464 +474 @@
 
     /* 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;
 };

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -2630 +2630 @@
                       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;
@@ -2651 +2651 @@
                                            unsigned msec_delay)
 {
-    struct timer_list *tmr = NULL;
+    pjsua_timer_list *tmr = NULL;
     pj_status_t status;
     pj_time_val delay;
@@ -2658 +2658 @@
 
     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;