From 573046659986d036650c25cd214c75d9ee0b508a Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 21 Nov 2020 00:03:47 +0100 Subject: libfshelp: Fix extern inline definitions The commit [1] updated rlock.h and fshelp.h to use FSHELP_DEFINE_EXTERN_INLINE but it's never defined because FSHELP_EXTERN_INLINE is used in libfshelp/extern-inline.c. Update this file to use define FSHELP_DEFINE_EXTERN_INLINE. [1] ca3d36201329f0e21b995d831ce9f6f03b6b985e * libfshelp/extern-inline.c: define FSHELP_DEFINE_EXTERN_INLINE. * libfshelp/fshelp.h: define FSHELP_EXTERN_INLINE __extern_inline if FSHELP_DEFINE_EXTERN_INLINE is not defined. * libfshelp/rlock.h: Likewise Signed-off-by: Romain Naour Signed-off-by: Samuel Thibault Message-Id: <20201120230347.2432672-1-romain.naour@gmail.com> --- libfshelp/extern-inline.c | 2 +- libfshelp/fshelp.h | 4 +++- libfshelp/rlock.h | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libfshelp/extern-inline.c b/libfshelp/extern-inline.c index 2572ab2e..331531b3 100644 --- a/libfshelp/extern-inline.c +++ b/libfshelp/extern-inline.c @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with the GNU Hurd. If not, see . */ -#define FSHELP_EXTERN_INLINE +#define FSHELP_DEFINE_EXTERN_INLINE #include "fshelp.h" #include "rlock.h" diff --git a/libfshelp/fshelp.h b/libfshelp/fshelp.h index 40d65b39..aa48867e 100644 --- a/libfshelp/fshelp.h +++ b/libfshelp/fshelp.h @@ -18,7 +18,9 @@ #ifndef _HURD_FSHELP_ #define _HURD_FSHELP_ -#ifndef FSHELP_EXTERN_INLINE +#ifdef FSHELP_DEFINE_EXTERN_INLINE +#define FSHELP_EXTERN_INLINE +#else #define FSHELP_EXTERN_INLINE __extern_inline #endif diff --git a/libfshelp/rlock.h b/libfshelp/rlock.h index e1b7b257..32f006db 100644 --- a/libfshelp/rlock.h +++ b/libfshelp/rlock.h @@ -21,7 +21,9 @@ #ifndef FSHELP_RLOCK_H #define FSHELP_RLOCK_H -#ifndef FSHELP_EXTERN_INLINE +#ifdef FSHELP_DEFINE_EXTERN_INLINE +#define FSHELP_EXTERN_INLINE +#else #define FSHELP_EXTERN_INLINE __extern_inline #endif -- cgit v1.2.3