diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-09 20:48:02 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-09 20:48:02 +0000 |
| commit | f2cc3a3590d44baf73a718259d5c914e763b0111 (patch) | |
| tree | e4e4cc7f5aba7108fe85bc080ab50f7fbbc6739d /apps/app_festival.c | |
| parent | 59398aee605d590d47b14765388822bfa1cccb2a (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@162278 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_festival.c')
| -rw-r--r-- | apps/app_festival.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/apps/app_festival.c b/apps/app_festival.c index ab94ec4cd..649707be9 100644 --- a/apps/app_festival.c +++ b/apps/app_festival.c @@ -120,7 +120,6 @@ static int send_waveform_to_fd(char *waveform, int length, int fd) int res; #ifdef __PPC__ char c; - int x; #endif res = ast_safe_fork(0); |