From 57ba929781a9e69cfb81f73062674f04c62914ae Mon Sep 17 00:00:00 2001
From: =?utf8?q?Wilfried=20G=C3=B6esgens?= <willi@citadel.org>
Date: Tue, 18 May 2010 23:06:21 +0000
Subject: [PATCH] * same as for citserver: move INLINE functions from .c to .h
 and make them static INLINE; thanks again to #llvm, jyasskin and sabre

---
 citadel/include/citadel_ipc.h | 21 +++++++++++++++++++--
 citadel/utillib/citadel_ipc.c | 18 ------------------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/citadel/include/citadel_ipc.h b/citadel/include/citadel_ipc.h
index dc05dc885..6c9424fb5 100644
--- a/citadel/include/citadel_ipc.h
+++ b/citadel/include/citadel_ipc.h
@@ -334,8 +334,6 @@ int CtdlIPCMessageBaseCheck(CtdlIPC *ipc, char **mret, char *cret);
 /*             Stuff below this line is not for public consumption            */
 /* ************************************************************************** */
 
-INLINE void CtdlIPC_lock(CtdlIPC *ipc);
-INLINE void CtdlIPC_unlock(CtdlIPC *ipc);
 char *CtdlIPCReadListing(CtdlIPC *ipc, char *dest);
 int CtdlIPCSendListing(CtdlIPC *ipc, const char *listing);
 size_t CtdlIPCPartialRead(CtdlIPC *ipc, void **buf, size_t offset,
@@ -368,6 +366,25 @@ void connection_died(CtdlIPC* ipc, int using_ssl);
 int CtdlIPC_getsockfd(CtdlIPC* ipc);
 char CtdlIPC_get(CtdlIPC* ipc);
 
+
+
+static INLINE void CtdlIPC_lock(CtdlIPC *ipc)
+{
+	if (ipc->network_status_cb) ipc->network_status_cb(1);
+#ifdef THREADED_CLIENT
+	pthread_mutex_lock(&(ipc->mutex));
+#endif
+}
+
+
+static INLINE void CtdlIPC_unlock(CtdlIPC *ipc)
+{
+#ifdef THREADED_CLIENT
+	pthread_mutex_unlock(&(ipc->mutex));
+#endif
+	if (ipc->network_status_cb) ipc->network_status_cb(0);
+}
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/citadel/utillib/citadel_ipc.c b/citadel/utillib/citadel_ipc.c
index 19bac8d11..d16606f8e 100644
--- a/citadel/utillib/citadel_ipc.c
+++ b/citadel/utillib/citadel_ipc.c
@@ -2188,24 +2188,6 @@ int CtdlIPCMessageBaseCheck(CtdlIPC *ipc, char **mret, char *cret)
 /* ************************************************************************** */
 
 
-INLINE void CtdlIPC_lock(CtdlIPC *ipc)
-{
-	if (ipc->network_status_cb) ipc->network_status_cb(1);
-#ifdef THREADED_CLIENT
-	pthread_mutex_lock(&(ipc->mutex));
-#endif
-}
-
-
-INLINE void CtdlIPC_unlock(CtdlIPC *ipc)
-{
-#ifdef THREADED_CLIENT
-	pthread_mutex_unlock(&(ipc->mutex));
-#endif
-	if (ipc->network_status_cb) ipc->network_status_cb(0);
-}
-
-
 /* Read a listing from the server up to 000.  Append to dest if it exists */
 char *CtdlIPCReadListing(CtdlIPC *ipc, char *dest)
 {
-- 
2.39.2