From: Ivo Raisr <ivosh@ivosh.net>
Date: Thu, 18 Feb 2016 17:15:45 +0000 (+0000)
Subject: Fix some compiler errors about accessing static variables
X-Git-Tag: svn/VALGRIND_3_12_0~226
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c83cafb93a7b1c4acbf00139b6fceb025647c44;p=thirdparty%2Fvalgrind.git

Fix some compiler errors about accessing static variables
from non-static inline functions reported by gcc 5.3:
warning: "locf" is static but declared in inline function "fun_f" which is not static

While at it, silence also compiler warning about uninitialized
variable "result" when calling fun_a().

n-i-bz


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

diff --git a/memcheck/tests/solaris/Makefile.am b/memcheck/tests/solaris/Makefile.am
index 672a5cf5fc..c8c908ca97 100644
--- a/memcheck/tests/solaris/Makefile.am
+++ b/memcheck/tests/solaris/Makefile.am
@@ -169,7 +169,7 @@ inlinfo_DEPENDENCIES = inlinfo_nested.so
 inlinfo_LDFLAGS = -Wl,-rpath,$(top_builddir)/memcheck/tests/solaris
 inlinfo_LDADD = inlinfo_nested.so
 inlinfo_nested_so_SOURCES = inlinfo_nested.c
-inlinfo_nested_so_CFLAGS = $(AM_CFLAGS) -fPIC
+inlinfo_nested_so_CFLAGS = $(AM_CFLAGS) -fPIC @FLAG_W_NO_UNINITIALIZED@
 inlinfo_nested_so_LDFLAGS = -Wl,-rpath,$(top_builddir)/memcheck/tests/solaris -shared -fPIC
 
 mmapobj_bssonly_SOURCES = mmapobj_bssonly.c
diff --git a/memcheck/tests/solaris/inlinfo_nested.c b/memcheck/tests/solaris/inlinfo_nested.c
index 88fe09b16c..38a6580614 100644
--- a/memcheck/tests/solaris/inlinfo_nested.c
+++ b/memcheck/tests/solaris/inlinfo_nested.c
@@ -3,7 +3,7 @@
  */
 
 #include "../../memcheck.h"
-#define INLINE    inline __attribute__((always_inline))
+#define INLINE static inline __attribute__((always_inline))
 
 INLINE int fun_d(int argd) {
    static int locd = 0;