Attachment 75498 Details for Bug 61433 – [0.12 2b/6] sasl test: fix build failure on older libsasl2s

[patch] [0.12 2b/6] sasl test: fix build failure on older libsasl2s

0002-sasl-test-fix-build-failure-on-older-libsasl2s.patch (text/plain), 1.16 KB, created by Simon McVittie on 2013-02-25 11:51:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-02-25 11:51:52 UTC

Size: 1.16 KB

patch

obsolete

>From 98d28f718d5d23b1f92f6db32ad482bee4dc4832 Mon Sep 17 00:00:00 2001
>From: Jonny Lamb <jonny.lamb@collabora.co.uk>
>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 <jonny.lamb@collabora.co.uk>
>Backported: Simon McVittie <simon.mcvittie@collabora.co.uk>
>---
> 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
>

Actions: View | Splinter Review

Attachments on bug 61433: 75495 | 75496 | 75497 | 75498 | 75499 | 75500 | 75501 | 75502 | 75503

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.