From 1fbbdbf26ddd694f7a28ef76a8dc129a23848a17 Mon Sep 17 00:00:00 2001
From: Joshua Colp <jcolp@digium.com>
Date: Tue, 9 Dec 2008 20:47:11 +0000
Subject: [PATCH] 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
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@162276 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 apps/app_festival.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/app_festival.c b/apps/app_festival.c
index de8c618518..4e1e47e8a5 100644
--- a/apps/app_festival.c
+++ b/apps/app_festival.c
@@ -121,7 +121,6 @@ static int send_waveform_to_fd(char *waveform, int length, int fd)
 	int x;
 #ifdef __PPC__ 
 	char c;
-	int x;
 #endif
 	sigset_t fullset, oldset;