From 1a5cb61fbc13f124a9fea9127cb435cea37b92fe Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Wed, 6 Jan 2016 20:59:01 +0100 Subject: [PATCH] remove INLINE, it seems to be problematic with newer gcc's --- textclient/src/citadel_ipc.c | 4 ++-- textclient/src/include/citadel_ipc.h | 9 ++------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/textclient/src/citadel_ipc.c b/textclient/src/citadel_ipc.c index 907100db3..ec23b1626 100644 --- a/textclient/src/citadel_ipc.c +++ b/textclient/src/citadel_ipc.c @@ -92,7 +92,7 @@ char *axdefs[]={ }; -INLINE void CtdlIPC_lock(CtdlIPC *ipc) +void CtdlIPC_lock(CtdlIPC *ipc) { if (ipc->network_status_cb) ipc->network_status_cb(1); #ifdef THREADED_CLIENT @@ -101,7 +101,7 @@ INLINE void CtdlIPC_lock(CtdlIPC *ipc) } -INLINE void CtdlIPC_unlock(CtdlIPC *ipc) +void CtdlIPC_unlock(CtdlIPC *ipc) { #ifdef THREADED_CLIENT pthread_mutex_unlock(&(ipc->mutex)); diff --git a/textclient/src/include/citadel_ipc.h b/textclient/src/include/citadel_ipc.h index ac4450b13..cad578b61 100644 --- a/textclient/src/include/citadel_ipc.h +++ b/textclient/src/include/citadel_ipc.h @@ -1,8 +1,3 @@ -#ifdef __GNUC__ -#define INLINE __inline__ -#else -#define INLINE -#endif #define UDS "_UDS_" #ifdef __CYGWIN__ @@ -476,9 +471,9 @@ char CtdlIPC_get(CtdlIPC* ipc); -INLINE void CtdlIPC_lock(CtdlIPC *ipc); +void CtdlIPC_lock(CtdlIPC *ipc); -INLINE void CtdlIPC_unlock(CtdlIPC *ipc); +void CtdlIPC_unlock(CtdlIPC *ipc); char *libcitadelclient_version_string(void); -- 2.30.2