Changeset 1464

Timestamp:

Sep 30, 2007 6:06:41 PM (17 years ago)

Author:

bennylp

Message:

Fixed compilation error in sip_100rel.c when c++ mode is used

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_100rel.c (modified) (12 diffs)

pjproject/trunk/pjsip/src/pjsip-ua/sip_100rel.c

@@ -87 +87 @@
 
 /* List of pending transmission (may include the final response as well) */
-typedef struct tx_data_list
-{
-        PJ_DECL_LIST_MEMBER(struct tx_data_list);
+typedef struct tx_data_list_t
+{
+        PJ_DECL_LIST_MEMBER(struct tx_data_list_t);
         pj_uint32_t      rseq;
         pjsip_tx_data   *tdata;
-} tx_data_list;
+} tx_data_list_t;
 
 
@@ -98 +98 @@
 
 /* UAS state. */
-typedef struct uas_state
+typedef struct uas_state_t
 {
         pj_int32_t       cseq;
         pj_uint32_t      rseq;  /* Initialized to -1 */
         pj_bool_t        has_sdp;
-        tx_data_list     tx_data_list;
+        tx_data_list_t   tx_data_list;
         unsigned         retransmit_count;
         pj_timer_entry   retransmit_timer;
-} uas_state;
+} uas_state_t;
 
 
 /* UAC state */
-typedef struct uac_state
+typedef struct uac_state_t
 {
         pj_int32_t      cseq;
         pj_uint32_t     rseq;   /* Initialized to -1 */
-} uac_state;
+} uac_state_t;
 
 
@@ -121 +121 @@
 {
         pjsip_inv_session       *inv;
-        uas_state               *uas_state;
-        uac_state               *uac_state;
+        uas_state_t             *uas_state;
+        uac_state_t             *uac_state;
 };
 
@@ -276 +276 @@
 static void clear_all_responses(dlg_data *dd)
 {
-        tx_data_list *tl;
+        tx_data_list_t *tl;
 
         tl = dd->uas_state->tx_data_list.next;
@@ -332 +332 @@
             cseq == dd->uas_state->cseq)
         {
-                tx_data_list *tl = dd->uas_state->tx_data_list.next;
+                tx_data_list_t *tl = dd->uas_state->tx_data_list.next;
 
                 /* Yes it match! */
@@ -405 +405 @@
         if (dd->uac_state == NULL) {
                 dd->uac_state = PJ_POOL_ZALLOC_T(dd->inv->dlg->pool,
-                                                 struct uac_state);
+                                                 uac_state_t);
                 dd->uac_state->cseq = rdata->msg_info.cseq->cseq;
                 dd->uac_state->rseq = rseq - 1;
@@ -449 +449 @@
                                      (int)tsx->method.name.slen,
                                      tsx->method.name.ptr);
-        PJ_ASSERT_ON_FAIL(rack.slen > 0 && rack.slen < sizeof(rack_buf),
+        PJ_ASSERT_ON_FAIL(rack.slen > 0 && rack.slen < (int)sizeof(rack_buf),
                         { pjsip_tx_data_dec_ref(tdata); return; });
         rack_hdr = pjsip_generic_string_hdr_create(tdata->pool, &RACK, &rack);
@@ -500 +500 @@
 {
         dlg_data *dd;
-        tx_data_list *tl;
+        tx_data_list_t *tl;
         pjsip_tx_data *tdata;
         pj_bool_t final;
@@ -600 +600 @@
         hsrc = src->msg->hdr.next;
         while (hsrc != &src->msg->hdr) {
-                pjsip_hdr *h = pjsip_hdr_clone(dst->pool, hsrc);
+                pjsip_hdr *h = (pjsip_hdr*) pjsip_hdr_clone(dst->pool, hsrc);
                 pjsip_msg_add_hdr(msg, h);
                 hsrc = hsrc->next;
@@ -683 +683 @@
                          * In this case, must queue the 2xx response.
                          */
-                        tx_data_list *tl;
-
-                        tl = PJ_POOL_ZALLOC_T(tdata->pool, tx_data_list);
+                        tx_data_list_t *tl;
+
+                        tl = PJ_POOL_ZALLOC_T(tdata->pool, tx_data_list_t);
                         tl->tdata = tdata;
                         tl->rseq = (pj_uint32_t)-1;
@@ -762 +762 @@
                 char rseq_str[32];
                 pj_str_t rseq;
-                tx_data_list *tl;
+                tx_data_list_t *tl;
 
                 /* Create UAS state if we don't have one */
                 if (dd->uas_state == NULL) {
                         dd->uas_state = PJ_POOL_ZALLOC_T(inv->dlg->pool,
-                                                         uas_state);
+                                                         uas_state_t);
                         dd->uas_state->cseq = cseq_hdr->cseq;
                         dd->uas_state->rseq = pj_rand() % 0x7FFF;
@@ -794 +794 @@
 
                 /* Create list entry for this response */
-                tl = PJ_POOL_ZALLOC_T(tdata->pool, tx_data_list);
+                tl = PJ_POOL_ZALLOC_T(tdata->pool, tx_data_list_t);
                 tl->tdata = tdata;
                 tl->rseq = dd->uas_state->rseq++;