diff options
| author | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2013-09-21 00:35:29 +0200 |
|---|---|---|
| committer | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2013-11-01 04:48:56 +0100 |
| commit | 0930779b0ed162659461fa90ccb698b811bdfe02 (patch) | |
| tree | 55e0637fa9ddd1fda413f1a710cd40ffc0a6f286 | |
| parent | 2706e1ca0c118cb78fbbbc977e4e95e14fdedebc (diff) | |
| download | srec-linaro_android_4.4.tar.gz | |
Add workarounds for clang buglinaro_android_4.4.4linaro_android_4.4.3linaro_android_4.4.2linaro_android_4.4
Without this, clang errors out complaining about undefined references.
Chances are the functions are not built into the object file (because
they're marked inline) but end up being called rather than inlined
anyway.
Change-Id: I7967e83389f6503b0ae26f4c8f72e19dfe6f79a0
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
| -rw-r--r-- | srec/Recognizer/src/RecognizerImpl.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/srec/Recognizer/src/RecognizerImpl.c b/srec/Recognizer/src/RecognizerImpl.c index f64a1db..76523da 100644 --- a/srec/Recognizer/src/RecognizerImpl.c +++ b/srec/Recognizer/src/RecognizerImpl.c @@ -2601,7 +2601,11 @@ CLEANUP: * INPUT STATES: SR_RECOGNIZER_INTERNAL_BOS_DETECTION, SR_RECOGNIZER_INTERNAL_EOS_DETECTION * OUTPUT STATES: same or SR_RECOGNIZER_INTERNAL_EOI */ +#ifdef __clang__ /* FIXME workaround for clang bug (errors out when building) -- remove once fixed */ +static ESR_ReturnCode canPushAudioIntoRecognizer(SR_RecognizerImpl* impl) +#else PINLINE ESR_ReturnCode canPushAudioIntoRecognizer(SR_RecognizerImpl* impl) +#endif { ESR_ReturnCode rc; @@ -2654,9 +2658,15 @@ CLEANUP: * INPUT STATES: SR_RECOGNIZER_INTERNAL_BOS_DETECTION, SR_RECOGNIZER_INTERNAL_EOS_DETECTION * OUTPUT STATES: same */ +#ifdef __clang__ /* FIXME workaround for clang bug (errors out when building) -- remove once fixed */ +static ESR_ReturnCode pushAudioIntoRecognizer(SR_RecognizerImpl* impl, SR_RecognizerStatus* status, + SR_RecognizerResultType* type, + SR_RecognizerResult* result) +#else PINLINE ESR_ReturnCode pushAudioIntoRecognizer(SR_RecognizerImpl* impl, SR_RecognizerStatus* status, SR_RecognizerResultType* type, SR_RecognizerResult* result) +#endif { size_t count; ESR_ReturnCode rc; @@ -2780,9 +2790,15 @@ PINLINE ESR_ReturnCode generateFrameStats(SR_RecognizerImpl* impl, SR_Recognizer * INPUT STATES: SR_RECOGNIZER_INTERNAL_EOS_DETECTION * OUTPUT STATES: same or SR_RECOGNIZER_INTERNAL_EOI, SR_RECOGNIZER_INTERNAL_EOS */ +#ifdef __clang__ /* FIXME workaround for clang bug (errors out when building) -- remove once fixed */ PINLINE ESR_ReturnCode generatePatternFromFrame(SR_RecognizerImpl* impl, SR_RecognizerStatus* status, SR_RecognizerResultType* type, SR_RecognizerResult* result) +#else +PINLINE ESR_ReturnCode generatePatternFromFrame(SR_RecognizerImpl* impl, SR_RecognizerStatus* status, + SR_RecognizerResultType* type, + SR_RecognizerResult* result) +#endif { SR_AcousticModelsImpl* modelsImpl; ESR_ReturnCode rc; @@ -2889,9 +2905,15 @@ CLEANUP: * INPUT STATES: SR_RECOGNIZER_INTERNAL_EOI * OUTPUT STATES: same or SR_RECOGNIZER_INTERNAL_EOS */ +#ifdef __clang__ /* FIXME workaround for clang bug (errors out when building) -- remove once fixed */ +static ESR_ReturnCode generatePatternFromFrameEOI(SR_RecognizerImpl* impl, SR_RecognizerStatus* status, + SR_RecognizerResultType* type, + SR_RecognizerResult* result) +#else PINLINE ESR_ReturnCode generatePatternFromFrameEOI(SR_RecognizerImpl* impl, SR_RecognizerStatus* status, SR_RecognizerResultType* type, SR_RecognizerResult* result) +#endif { SR_AcousticModelsImpl* modelsImpl; ESR_ReturnCode rc; |