diff options
author | Jonathan Rose <jrose@digium.com> | 2012-04-04 18:08:28 +0000 |
---|---|---|
committer | Jonathan Rose <jrose@digium.com> | 2012-04-04 18:08:28 +0000 |
commit | e96a59acfdbd655045ad8d8292cde674d2236645 (patch) | |
tree | 0adb9e4b51d96b070321db626eea3fd506d04079 /main | |
parent | 97b2fa8de18777eb31f20e86dd1c31ffa3a0f17b (diff) |
Replace GNU old-style field designator extensions to fix clang warnings
(issue ASTERISK-19540)
Reported by: Makoto Dei
Patches:
clang-gnu-designator.patch uploaded by Makoto Dei (license 5027)
........
Also add from the patch the portion in res_fax_spandsp that didn't apply to 1.8
Merged revisions 361142 from http://svn.asterisk.org/svn/asterisk/branches/1.8
(closes issue ASTERISK-19540)
........
Merged revisions 361143 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@361155 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r-- | main/app.c | 6 | ||||
-rw-r--r-- | main/channel.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/main/app.c b/main/app.c index bb6a9bd62..0634bb819 100644 --- a/main/app.c +++ b/main/app.c @@ -578,9 +578,9 @@ static void *linear_alloc(struct ast_channel *chan, void *params) static struct ast_generator linearstream = { - alloc: linear_alloc, - release: linear_release, - generate: linear_generator, + .alloc = linear_alloc, + .release = linear_release, + .generate = linear_generator, }; int ast_linear_stream(struct ast_channel *chan, const char *filename, int fd, int allowoverride) diff --git a/main/channel.c b/main/channel.c index b86cd5252..5f549f379 100644 --- a/main/channel.c +++ b/main/channel.c @@ -7714,9 +7714,9 @@ static int tonepair_generator(struct ast_channel *chan, void *data, int len, int } static struct ast_generator tonepair = { - alloc: tonepair_alloc, - release: tonepair_release, - generate: tonepair_generator, + .alloc = tonepair_alloc, + .release = tonepair_release, + .generate = tonepair_generator, }; int ast_tonepair_start(struct ast_channel *chan, int freq1, int freq2, int duration, int vol) |