From: Willy Tarreau <w@1wt.eu>
Date: Thu, 18 Oct 2012 13:11:52 +0000 (+0200)
Subject: BUILD: ssl: fix shctx build on older compilers
X-Git-Tag: v1.5-dev13~138
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=338a4fc2a88cc9a1e21d1fd327a20555c3bf5f10;p=thirdparty%2Fhaproxy.git

BUILD: ssl: fix shctx build on older compilers

gcc < 3 breaks on shctx because of the missing arg in the lock macros.
We don't need the arg at all, it's not used.
---

diff --git a/src/shctx.c b/src/shctx.c
index b8bfd4a49a..0db443decb 100644
--- a/src/shctx.c
+++ b/src/shctx.c
@@ -62,8 +62,8 @@ static void (*shared_session_new_cbk)(unsigned char *session, unsigned int sessi
 
 /* Lock functions */
 #ifdef USE_PRIVATE_CACHE
-#define shared_context_lock(v)
-#define shared_context_unlock(v)
+#define shared_context_lock()
+#define shared_context_unlock()
 
 #else
 #ifdef USE_SYSCALL_FUTEX
@@ -141,15 +141,15 @@ static inline void _shared_context_unlock(void)
 	}
 }
 
-#define shared_context_lock(v)   if (use_shared_mem) _shared_context_lock()
+#define shared_context_lock()   if (use_shared_mem) _shared_context_lock()
 
-#define shared_context_unlock(v) if (use_shared_mem) _shared_context_unlock()
+#define shared_context_unlock() if (use_shared_mem) _shared_context_unlock()
 
 #else /* USE_SYSCALL_FUTEX */
 
-#define shared_context_lock(v)   if (use_shared_mem) pthread_mutex_lock(&shctx->mutex)
+#define shared_context_lock()   if (use_shared_mem) pthread_mutex_lock(&shctx->mutex)
 
-#define shared_context_unlock(v) if (use_shared_mem) pthread_mutex_unlock(&shctx->mutex)
+#define shared_context_unlock() if (use_shared_mem) pthread_mutex_unlock(&shctx->mutex)
 
 #endif
 #endif