[Pkg-voip-commits] r8959 - in /asterisk/trunk/debian: changelog patches/gcc46

[tzafrir at alioth.debian.org]

Author: tzafrir
Date: Thu May 26 10:59:53 2011
New Revision: 8959

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8959
Log:
Patch gcc46: Fix the induced regression.

Modified:
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/patches/gcc46

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=8959&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Thu May 26 10:59:53 2011
@@ -2,8 +2,9 @@
 
   * NOT RELEASED YET
   * New upstream point release.
-
- -- Tzafrir Cohen <tzafrir at debian.org>  Mon, 16 May 2011 08:25:27 +0300
+  * Patch gcc46: Fix the induced regression.
+
+ -- Tzafrir Cohen <tzafrir at debian.org>  Thu, 26 May 2011 13:56:21 +0300
 
 asterisk (1:1.8.4-1) unstable; urgency=low
 

Modified: asterisk/trunk/debian/patches/gcc46
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/gcc46?rev=8959&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/gcc46 (original)
+++ asterisk/trunk/debian/patches/gcc46 Thu May 26 10:59:53 2011
@@ -4,6 +4,8 @@
 
 Most of these are -Wunused-but-set-variable, but there were a few others
 mixed in here, as well.
+
+Including the fixe from upstream commit r319083.
 
 This is a patch from upstream and will be included in 1.8.5 or 1.8.6.
 
@@ -548,9 +550,11 @@
 index baeaf45..fdd6e14 100644
 --- a/formats/format_wav.c
 +++ b/formats/format_wav.c
-@@ -355,7 +355,6 @@ static struct ast_frame *wav_read(struct ast_filestream *s, int *whennext)
+@@ -354,8 +354,8 @@ static struct ast_frame *wav_read(struct ast_filestream *s, int *whennext)
+ 	int samples;	/* actual samples read */
  #if __BYTE_ORDER == __BIG_ENDIAN
  	int x;
++	short *tmp;
  #endif
 -	short *tmp;
  	int bytes;