commit 211c2539f9419a2be09f8f75d40a42196db66b51
author sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> Tue Jul 12 06:13:08 2011 +0000
committer sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> Tue Jul 12 06:13:08 2011 +0000
tree c33f11e756745f1857aef4ffb46077f10e1598cd
parent 0c09bf0aa1e54446916b32f69eb8da2c813af3a8

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


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11876 a5019735-40e9-0310-863c-91ae7b9d1cf9

helgrind/hg_intercepts.c

diff --git a/helgrind/hg_intercepts.c b/helgrind/hg_intercepts.c
index 20b368c..241df23 100644
--- a/helgrind/hg_intercepts.c
+++ b/helgrind/hg_intercepts.c
@@ -2159,6 +2159,10 @@
          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*, _ZN6QMutexD2Ev, void* mutex)
 {
    assert(0);
+   /* Android's gcc behaves like it doesn't know that assert(0)
+      never returns.  Hence: */
+   return NULL;
 }