From c619e558da53617b9a63f8d041bbb7ff45a718b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?= Date: Fri, 7 Apr 2017 11:21:18 +0200 Subject: [PATCH] lib/mpi: Use "static inline" instead of "inline" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The commit 2e7dc31cf2a8e3665e5c68ee03d177134b2c90ca had replaced "extern inline" with "inline" in order to fix the build with GCC 5, because of new inline semantics. However, this change breaks the build with GCC 4.9, causing many errors such as: lib/mpi/generic_mpih-mul1.o: In function `mpihelp_add_1': generic_mpih-mul1.c:(.text+0x0): multiple definition of `mpihelp_add_1' lib/mpi/generic_mpih-lshift.o:generic_mpih-lshift.c:(.text+0x0): first defined here Fix this like in the mainline commit 9c6bd0c2f103f4748cb4abcaf141f7d11aabfe9f, by using "static inline". Signed-off-by: Benoît Thébaudeau --- lib/mpi/mpi-inline.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mpi/mpi-inline.h b/lib/mpi/mpi-inline.h index 3b176a50c5426..c245ea31f7853 100644 --- a/lib/mpi/mpi-inline.h +++ b/lib/mpi/mpi-inline.h @@ -30,7 +30,7 @@ #define G10_MPI_INLINE_H #ifndef G10_MPI_INLINE_DECL -#define G10_MPI_INLINE_DECL inline +#define G10_MPI_INLINE_DECL static inline #endif G10_MPI_INLINE_DECL mpi_limb_t