[Pkg-voip-commits] r3854 - libccrtp/trunk/debian/patches

kilian at alioth.debian.org kilian at alioth.debian.org
Fri Jul 27 17:43:29 UTC 2007


Author: kilian
Date: 2007-07-27 17:43:29 +0000 (Fri, 27 Jul 2007)
New Revision: 3854

Modified:
   libccrtp/trunk/debian/patches/gcc-4.3.patch
Log:
fix application of patch


Modified: libccrtp/trunk/debian/patches/gcc-4.3.patch
===================================================================
--- libccrtp/trunk/debian/patches/gcc-4.3.patch	2007-07-27 17:39:42 UTC (rev 3853)
+++ libccrtp/trunk/debian/patches/gcc-4.3.patch	2007-07-27 17:43:29 UTC (rev 3854)
@@ -1,5 +1,186 @@
---- src/ccrtp/rtppkt.h~	2007-04-26 17:09:32.000000000 +0000
-+++ src/ccrtp/rtppkt.h	2007-04-26 17:10:57.000000000 +0000
+diff -urN ccrtp-1.5.1.orig/src/ccrtp/cqueue.h ccrtp-1.5.1/src/ccrtp/cqueue.h
+--- ccrtp-1.5.1.orig/src/ccrtp/cqueue.h	2006-12-31 14:11:39.000000000 +0100
++++ ccrtp-1.5.1/src/ccrtp/cqueue.h	2007-07-27 19:42:50.000000000 +0200
+@@ -131,7 +131,7 @@
+ 	 */
+ 	inline void
+ 	setEnd2EndDelay(microtimeout_t t)
+-		{ end2EndDelay = t; };
++		{ end2EndDelay = t; }
+ 
+ 	inline microtimeout_t
+ 	getDefaultEnd2EndDelay() const
+@@ -156,7 +156,7 @@
+ 	 */
+ 	inline void
+ 	setSendersControlFraction(float fraction)
+-	{ sendControlBwFract = fraction; recvControlBwFract = 1 - fraction;};
++	{ sendControlBwFract = fraction; recvControlBwFract = 1 - fraction;}
+ 
+ 	/**
+ 	 * Manually set the minimum interval for sending RTP compound
+@@ -309,11 +309,11 @@
+ 	 **/
+ 	inline void
+ 	setPrevMembersNum(uint32 n)
+-	{ reconsInfo.rtcpPMembers = n; };
++	{ reconsInfo.rtcpPMembers = n; }
+ 
+ 	inline uint32
+ 	getPrevMembersCount() const
+-	{ return reconsInfo.rtcpPMembers; };
++	{ return reconsInfo.rtcpPMembers; }
+ 
+ 	/**
+ 	 * This method is used to send an RTCP BYE packet.  An RTCP
+diff -urN ccrtp-1.5.1.orig/src/ccrtp/ioqueue.h ccrtp-1.5.1/src/ccrtp/ioqueue.h
+--- ccrtp-1.5.1.orig/src/ccrtp/ioqueue.h	2006-12-31 14:11:44.000000000 +0100
++++ ccrtp-1.5.1/src/ccrtp/ioqueue.h	2007-07-27 19:42:50.000000000 +0200
+@@ -282,7 +282,7 @@
+ 	{ return; }
+ 
+ 	void renewLocalSSRC()
+-		{IncomingDataQueue::renewLocalSSRC();};
++		{IncomingDataQueue::renewLocalSSRC();}
+ 
+ private:
+ 	RTPDataQueue(const RTPDataQueue &o);
+diff -urN ccrtp-1.5.1.orig/src/ccrtp/iqueue.h ccrtp-1.5.1/src/ccrtp/iqueue.h
+--- ccrtp-1.5.1.orig/src/ccrtp/iqueue.h	2006-12-31 14:11:46.000000000 +0100
++++ ccrtp-1.5.1/src/ccrtp/iqueue.h	2007-07-27 19:42:50.000000000 +0200
+@@ -432,7 +432,7 @@
+ 		 * @return 32 bit timestamp starting from 0 for each source.
+ 		 */
+ 		inline uint32 getTimestamp() const
+-		{ return shiftedTimestamp; };
++		{ return shiftedTimestamp; }
+ 
+ 		inline void setTimestamp(uint32 ts)
+ 		{ shiftedTimestamp = ts;}
+diff -urN ccrtp-1.5.1.orig/src/ccrtp/oqueue.h ccrtp-1.5.1/src/ccrtp/oqueue.h
+--- ccrtp-1.5.1.orig/src/ccrtp/oqueue.h	2006-12-31 14:11:45.000000000 +0100
++++ ccrtp-1.5.1/src/ccrtp/oqueue.h	2007-07-27 19:42:50.000000000 +0200
+@@ -540,11 +540,11 @@
+ 	void purgeOutgoingQueue();
+ 
+         virtual void
+-        setControlPeer(const InetAddress &host, tpport_t port) {};
++        setControlPeer(const InetAddress &host, tpport_t port) {}
+ 
+ #ifdef	CCXX_IPV6
+ 	virtual void
+-	setControlPeerIPV6(const IPV6Address &host, tpport_t port) {};
++	setControlPeerIPV6(const IPV6Address &host, tpport_t port) {}
+ #endif
+ 
+         // The crypto contexts for outgoing SRTP sessions.
+@@ -561,11 +561,11 @@
+ 	{ }
+ 
+ 	virtual void
+-        setDataPeer(const InetAddress &host, tpport_t port) {};
++        setDataPeer(const InetAddress &host, tpport_t port) {}
+ 
+ #ifdef	CCXX_IPV6
+ 	virtual void
+-	setDataPeerIPV6(const IPV6Address &host, tpport_t port) {};
++	setDataPeerIPV6(const IPV6Address &host, tpport_t port) {}
+ #endif
+ 
+ 	/**
+@@ -578,11 +578,11 @@
+ 	 * @return number of bytes sent.
+ 	 **/
+ 	virtual size_t
+-	sendData(const unsigned char* const buffer, size_t len) {return 0;};
++	sendData(const unsigned char* const buffer, size_t len) {return 0;}
+ 
+ #ifdef	CCXX_IPV6
+ 	virtual size_t
+-	sendDataIPV6(const unsigned char* const buffer, size_t len) {return 0;};
++	sendDataIPV6(const unsigned char* const buffer, size_t len) {return 0;}
+ #endif
+ 
+ 	static const microtimeout_t defaultSchedulingTimeout;
+diff -urN ccrtp-1.5.1.orig/src/ccrtp/queuebase.h ccrtp-1.5.1/src/ccrtp/queuebase.h
+--- ccrtp-1.5.1.orig/src/ccrtp/queuebase.h	2006-12-31 14:11:46.000000000 +0100
++++ ccrtp-1.5.1/src/ccrtp/queuebase.h	2007-07-27 19:42:50.000000000 +0200
+@@ -95,7 +95,7 @@
+ 	 */
+ 	inline PayloadType
+ 	getType() const
+-	{ return datablock->getPayloadType(); };
++	{ return datablock->getPayloadType(); }
+ 
+ 	/**
+ 	 *  Get data as it is received in RTP packets (i.e. for
+@@ -106,14 +106,14 @@
+ 	 **/
+ 	inline const uint8* const
+ 	getData() const
+-	{ return datablock->getPayload(); };
++	{ return datablock->getPayload(); }
+ 		
+ 	/**
+ 	 * @return length of data in octets
+ 	 **/
+ 	size_t
+ 	getSize() const
+-	{ return datablock->getPayloadSize(); };
++	{ return datablock->getPayloadSize(); }
+ 
+ 	/**
+ 	 * @return Source that sent this data
+diff -urN ccrtp-1.5.1.orig/src/ccrtp/rtp.h ccrtp-1.5.1/src/ccrtp/rtp.h
+--- ccrtp-1.5.1.orig/src/ccrtp/rtp.h	2006-12-31 14:11:40.000000000 +0100
++++ ccrtp-1.5.1/src/ccrtp/rtp.h	2007-07-27 19:42:50.000000000 +0200
+@@ -190,7 +190,7 @@
+ 			}
+ 
+ 		inline RTPDataChannel *getDSO(void)
+-			{return dso;};
++			{return dso;}
+ 
+ 	protected:
+ 		/**
+@@ -528,10 +528,10 @@
+ {TRTPSessionBase<RTPDataChannel,RTCPChannel,ServiceQueue>::controlTransmissionService();}
+ 
+ inline timeval getRTCPCheckInterval(void)
+-{return TRTPSessionBase<RTPDataChannel,RTCPChannel,ServiceQueue>::getRTCPCheckInterval();};
++{return TRTPSessionBase<RTPDataChannel,RTCPChannel,ServiceQueue>::getRTCPCheckInterval();}
+ 
+ inline size_t dispatchDataPacket(void)
+-{return TRTPSessionBase<RTPDataChannel,RTCPChannel,ServiceQueue>::dispatchDataPacket();};
++{return TRTPSessionBase<RTPDataChannel,RTCPChannel,ServiceQueue>::dispatchDataPacket();}
+ 
+ #if defined(_MSC_VER) && _MSC_VER >= 1300
+ virtual void run(void);
+@@ -738,7 +738,7 @@
+ 		}
+ 
+ 	inline RTPDataChannel *getDSO(void)
+-		{return dso;};
++		{return dso;}
+ 
+ protected:
+ 	/**
+@@ -1053,10 +1053,10 @@
+ {TRTPSessionBase<RTPDataChannel,RTCPChannel,ServiceQueue>::controlTransmissionService();}
+ 
+ inline timeval getRTCPCheckInterval(void)
+-{return TRTPSessionBase<RTPDataChannel,RTCPChannel,ServiceQueue>::getRTCPCheckInterval();};
++{return TRTPSessionBase<RTPDataChannel,RTCPChannel,ServiceQueue>::getRTCPCheckInterval();}
+ 
+ inline size_t dispatchDataPacket(void)
+-{return TRTPSessionBase<RTPDataChannel,RTCPChannel,ServiceQueue>::dispatchDataPacket();};
++{return TRTPSessionBase<RTPDataChannel,RTCPChannel,ServiceQueue>::dispatchDataPacket();}
+ 
+ #if defined(_MSC_VER) && _MSC_VER >= 1300
+ virtual void run(void);
+diff -urN ccrtp-1.5.1.orig/src/ccrtp/rtppkt.h ccrtp-1.5.1/src/ccrtp/rtppkt.h
+--- ccrtp-1.5.1.orig/src/ccrtp/rtppkt.h	2006-12-31 14:11:39.000000000 +0100
++++ ccrtp-1.5.1/src/ccrtp/rtppkt.h	2007-07-27 19:42:50.000000000 +0200
 @@ -279,11 +279,11 @@
  	 **/
  	inline uint32
@@ -63,4 +244,41 @@
  	 **/
  	inline void
  	setPayloadType(PayloadType pt)
-
+-	{ getHeader()->payload = pt; };
++	{ getHeader()->payload = pt; }
+ 
+ 	/**
+          * Sets the sequence number in the header.
+diff -urN ccrtp-1.5.1.orig/src/control.cpp ccrtp-1.5.1/src/control.cpp
+--- ccrtp-1.5.1.orig/src/control.cpp	2006-12-31 14:12:43.000000000 +0100
++++ ccrtp-1.5.1/src/control.cpp	2007-07-27 19:42:50.000000000 +0200
+@@ -43,6 +43,8 @@
+ 
+ #include "private.h"
+ #include <ccrtp/cqueue.h>
++#include <cstdlib>
++#include <climits>
+ 
+ #ifdef  CCXX_NAMESPACES
+ namespace ost {
+diff -urN ccrtp-1.5.1.orig/src/queue.cpp ccrtp-1.5.1/src/queue.cpp
+--- ccrtp-1.5.1.orig/src/queue.cpp	2006-12-31 14:12:45.000000000 +0100
++++ ccrtp-1.5.1/src/queue.cpp	2007-07-27 19:42:50.000000000 +0200
+@@ -96,7 +96,7 @@
+ 	virtual std::ostream &strDigest(std::ostream &os) = 0;
+ 
+ 	friend std::ostream &operator<<(std::ostream &os, Digest &ia)
+-		{return ia.strDigest(os);};
++		{return ia.strDigest(os);}
+ 
+ public:
+ 	/**
+@@ -149,7 +149,7 @@
+ 	void initDigest(void);
+ 
+ 	inline unsigned getSize(void)
+-		{return 16;};
++		{return 16;}
+ 
+ 	unsigned getDigest(unsigned char *buffer);
+ 




More information about the Pkg-voip-commits mailing list