From 98d28f718d5d23b1f92f6db32ad482bee4dc4832 Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Mon, 25 Feb 2013 11:28:21 +0000 Subject: [PATCH 2/2] sasl test: fix build failure on older libsasl2s A second try. Signed-off-by: Jonny Lamb Backported: Simon McVittie --- tests/wocky-test-sasl-auth-server.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/wocky-test-sasl-auth-server.c b/tests/wocky-test-sasl-auth-server.c index 687b7d9..2e4da52 100644 --- a/tests/wocky-test-sasl-auth-server.c +++ b/tests/wocky-test-sasl-auth-server.c @@ -46,6 +46,13 @@ G_STMT_START { \ } \ } G_STMT_END +/* Apparently, we're allowed to typedef the same thing *again* if it's + * the same signature, so this allows for backwards compatiblity with + * older libsasl2s and also works with newer ones too. This'll only + * break if libsasl2 change the type of sasl_callback_ft. I sure hope + * they don't! */ +typedef int (*sasl_callback_ft)(void); + #else #define SASL_OK 0 -- 1.7.10.4