Stop gcc on Android giving bogus function-has-no-return-value warnings.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11876

diff --git a/helgrind/hg_intercepts.c b/helgrind/hg_intercepts.c
index 20b368c622d7aeb01ca2fc5428115b89de6be810..241df235051bde29f1aaed53dc70127cdb0c61e1 100644 (file)
--- a/helgrind/hg_intercepts.c
+++ b/helgrind/hg_intercepts.c
@@ -2159,6 +2159,10 @@ QT4_FUNC(void*, _ZN6QMutexC2ENS_13RecursionModeE,
          long  recmode)
 {
    assert(0);
+   /*NOTREACHED*/
+   /* Android's gcc behaves like it doesn't know that assert(0)
+      never returns.  Hence: */
+   return NULL;
 }
 
 
@@ -2167,6 +2171,9 @@ QT4_FUNC(void*, _ZN6QMutexC2ENS_13RecursionModeE,
 QT4_FUNC(void*, _ZN6QMutexD2Ev, void* mutex)
 {
    assert(0);
+   /* Android's gcc behaves like it doesn't know that assert(0)
+      never returns.  Hence: */
+   return NULL;
 }