[Linphone-developers] oRTP: restored build on linux/ia64

[Francois-Xavier 'FiX' KOWALSKI]

Simon,

In ILP32 data-model, int, long & void* are equivalent
In LP64 data-model: long & void* are equivalent, but not int

Please tell me if you see a problem in the following patch.

--- str_utils.c    31 Jan 2006 18:09:20 -0000    1.20
+++ str_utils.c    16 Feb 2006 17:56:55 -0000
@@ -267,7 +267,7 @@
    int padcnt=0;
    int i;
    if (pad){
-        padcnt= (int)(4L-( (long)(((int32_t)mp->b_wptr)+size) % 4L)) % 4L;
+        padcnt= (int)(4L-( (long)(((long)mp->b_wptr)+size) % 4L)) % 4L;
    }
    if ((mp->b_wptr + size +padcnt) > (char*)mp->b_datap->db_lim){
        /* buffer is not large enough: append a new block (with the 
same size ?)*/

--- telephonyevents.c    31 Jan 2006 18:09:20 -0000    1.17
+++ telephonyevents.c    16 Feb 2006 17:56:55 -0000
@@ -117,7 +117,7 @@
    /* find the place where to add the new telephony event to the packet */
    while(mp->b_cont!=NULL) mp=mp->b_cont;
    /* see if we need to allocate a new mblk_t */
-    if ( ((uint32_t) mp->b_wptr) >= ((uint32_t) mp->b_datap->db_lim)){
+    if ( ((long) mp->b_wptr) >= ((long) mp->b_datap->db_lim)){
        mblk_t *newm=allocb(TELEPHONY_EVENTS_ALLOCATED_SIZE,BPRI_MED);
        mp->b_cont=newm;
        mp=mp->b_cont;

--
 __________                                                
//_  o  \\/ Francois-Xavier "FiX" KOWALSKI                       
//   //  /\\ Everything is disclaimed, including disclaimer.