[svn-commits] file: branch 1.6.0 r162276 - in /branches/1.6.0: ./ apps/app_festival.c

[SVN commits to the Digium repositories]

Author: file
Date: Tue Dec  9 14:47:11 2008
New Revision: 162276

URL: http://svn.digium.com/view/asterisk?view=rev&rev=162276
Log:
Merged revisions 162275 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r162275 | file | 2008-12-09 16:46:11 -0400 (Tue, 09 Dec 2008) | 11 lines
  
  Merged revisions 162273 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r162273 | file | 2008-12-09 16:44:32 -0400 (Tue, 09 Dec 2008) | 4 lines
    
    Fix double declaration of 'x' on the PPC platform.
    (closes issue #14038)
    Reported by: ffloimair
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_festival.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_festival.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_festival.c?view=diff&rev=162276&r1=162275&r2=162276
==============================================================================
--- branches/1.6.0/apps/app_festival.c (original)
+++ branches/1.6.0/apps/app_festival.c Tue Dec  9 14:47:11 2008
@@ -121,7 +121,6 @@
 	int x;
 #ifdef __PPC__ 
 	char c;
-	int x;
 #endif
 	sigset_t fullset, oldset;