diff options
| author | Anthony Liguori <anthony@codemonkey.ws> | 2013-10-31 17:01:43 +0100 |
|---|---|---|
| committer | Anthony Liguori <anthony@codemonkey.ws> | 2013-10-31 17:01:43 +0100 |
| commit | ef5cfe5bbd8bb05a51afaf7ab313769eb9ef44b6 (patch) | |
| tree | 4d1361b6ba3a4aaa2d257b16cc947b50fb2effc7 /audio | |
| parent | 1ba1905abd72f34836b153f3348d618da6148f87 (diff) | |
| parent | 203cea22a3d33ac86d170af74f8c655f119c8c62 (diff) | |
| download | focaccia-qemu-ef5cfe5bbd8bb05a51afaf7ab313769eb9ef44b6.tar.gz focaccia-qemu-ef5cfe5bbd8bb05a51afaf7ab313769eb9ef44b6.zip | |
Merge remote-tracking branch 'mjt/trivial-patches' into staging
* mjt/trivial-patches: audio/mixeng_template.h: fix inline declaration misc: Spelling and grammar fixes in comments docs/ccid.txt: fix the typo qapi: fix documentation example .gitignore: ignore qmp-commands.txt misc: New spelling fixes in comments configure: create fsdev/ directory Message-id: 1382779887-15971-1-git-send-email-mjt@msgid.tls.msk.ru Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/mixeng_template.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/mixeng_template.h b/audio/mixeng_template.h index 30849a62a1..77cc89b9e8 100644 --- a/audio/mixeng_template.h +++ b/audio/mixeng_template.h @@ -35,7 +35,7 @@ #define IN_T glue (glue (ITYPE, BSIZE), _t) #ifdef FLOAT_MIXENG -static mixeng_real inline glue (conv_, ET) (IN_T v) +static inline mixeng_real glue (conv_, ET) (IN_T v) { IN_T nv = ENDIAN_CONVERT (v); @@ -54,7 +54,7 @@ static mixeng_real inline glue (conv_, ET) (IN_T v) #endif } -static IN_T inline glue (clip_, ET) (mixeng_real v) +static inline IN_T glue (clip_, ET) (mixeng_real v) { if (v >= 0.5) { return IN_MAX; |