[Pkg-voip-commits] r1489 - linphone/trunk/debian/patches

[Samuel Mimram]

Author: smimram
Date: 2006-03-22 14:00:43 +0000 (Wed, 22 Mar 2006)
New Revision: 1489

Modified:
   linphone/trunk/debian/patches/gcc-4.1.dpatch
Log:
Much nicer patch.

Modified: linphone/trunk/debian/patches/gcc-4.1.dpatch
===================================================================
--- linphone/trunk/debian/patches/gcc-4.1.dpatch	2006-03-22 11:52:12 UTC (rev 1488)
+++ linphone/trunk/debian/patches/gcc-4.1.dpatch	2006-03-22 14:00:43 UTC (rev 1489)
@@ -7,32 +7,20 @@
 @DPATCH@
 diff -urNad linphone-1.3.2~/oRTP/src/sessionset.c linphone-1.3.2/oRTP/src/sessionset.c
 --- linphone-1.3.2~/oRTP/src/sessionset.c	2006-02-01 16:30:04.000000000 +0000
-+++ linphone-1.3.2/oRTP/src/sessionset.c	2006-03-21 10:44:44.000000000 +0000
-@@ -60,19 +60,19 @@
- 
- int session_set_and(SessionSet *sched_set, int maxs, SessionSet *user_set, SessionSet *result_set)
- {
--	uint32_t *mask1,*mask2,*mask3;
-+	ortp_fd_set *mask1,*mask2,*mask3;
++++ linphone-1.3.2/oRTP/src/sessionset.c	2006-03-22 13:58:00.000000000 +0000
+@@ -63,9 +63,12 @@
+ 	uint32_t *mask1,*mask2,*mask3;
  	int i=0;
  	int j,ret=0;
 -	mask1=(uint32_t*)&sched_set->rtpset;
 -	mask2=(uint32_t*)&user_set->rtpset;
 -	mask3=(uint32_t*)&result_set->rtpset;
-+	mask1=&sched_set->rtpset;
-+	mask2=&user_set->rtpset;
-+	mask3=&result_set->rtpset;
++	ortp_fd_set *ss=&sched_set->rtpset;
++	ortp_fd_set *us=&user_set->rtpset;
++	ortp_fd_set *rs=&result_set->rtpset;
++	mask1=(uint32_t*)ss;
++	mask2=(uint32_t*)us;
++	mask3=(uint32_t*)rs;
  	while(i<maxs+1){
--		*mask3=(*mask1) & (*mask2);	/* computes the AND between the two masks*/
-+		*(uint32_t*)mask3=(*(uint32_t*)mask1) & (*(uint32_t*)mask2);	/* computes the AND between the two masks*/
+ 		*mask3=(*mask1) & (*mask2);	/* computes the AND between the two masks*/
  		/* and unset the sessions that have been found from the sched_set */
--		*mask1=(*mask1) & (~(*mask3));
--		if ((*mask3)!=0){
-+		*(uint32_t*)mask1=(*(uint32_t*)mask1) & (~(*(uint32_t*)mask3));
-+		if ((*(uint32_t*)mask3)!=0){
- 			for (j=0;j<32;j++){
--				if ( ((*mask3)>>j) & 1){
-+				if ( ((*(uint32_t*)mask3)>>j) & 1){
- 					ret++;
- 				}
- 			}