From: Julian Seward <jseward@acm.org>
Date: Tue, 12 Jul 2011 06:13:08 +0000 (+0000)
Subject: Stop gcc on Android giving bogus function-has-no-return-value warnings.
X-Git-Tag: svn/VALGRIND_3_7_0~361
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d0c673532dd4d067a76f9257230bc0081614e59;p=thirdparty%2Fvalgrind.git

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 20b368c622..241df23505 100644
--- 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;
 }