Changeset 4537 for pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c

Timestamp:

Jun 19, 2013 6:47:43 AM (11 years ago)

Author:

riza

Message:

Re #1680: Add initial support for Win64

File:

• pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c (modified) (6 diffs)

pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c

@@ -802 +802 @@
     pj_status_t status;
     transport_srtp *srtp = (transport_srtp*) tp;
-    int len = size;
+    int len = (int)size;
     err_status_t err;
 
@@ -846 +846 @@
     pj_status_t status;
     transport_srtp *srtp = (transport_srtp*) tp;
-    int len = size;
+    int len = (int)size;
     err_status_t err;
 
@@ -933 +933 @@
 
     /* Make sure buffer is 32bit aligned */
-    PJ_ASSERT_ON_FAIL( (((long)pkt) & 0x03)==0, return );
+    PJ_ASSERT_ON_FAIL( (((pj_ssize_t)pkt) & 0x03)==0, return );
 
     if (srtp->probation_cnt > 0)
@@ -1006 +1006 @@
 
     /* Make sure buffer is 32bit aligned */
-    PJ_ASSERT_ON_FAIL( (((long)pkt) & 0x03)==0, return );
+    PJ_ASSERT_ON_FAIL( (((pj_ssize_t)pkt) & 0x03)==0, return );
 
     pj_lock_acquire(srtp->mutex);
@@ -1118 +1118 @@
     pj_str_t input;
     char *token;
-    int token_len;
+    pj_size_t token_len;
     pj_str_t tmp;
     pj_status_t status;
@@ -1682 +1682 @@
 
     /* Make sure buffer is 32bit aligned */
-    PJ_ASSERT_ON_FAIL( (((long)pkt) & 0x03)==0, return PJ_EINVAL);
+    PJ_ASSERT_ON_FAIL( (((pj_ssize_t)pkt) & 0x03)==0, return PJ_EINVAL);
 
     pj_lock_acquire(srtp->mutex);