Comment 0 for bug 15288

Package: cyrus-sasl2
Severity: normal
Tags: patch

When building 'cyrus-sasl2' on amd64 with gcc-4.0,
I get the following error:

 gcc -DHAVE_CONFIG_H -I. -I. -I.. -I../include -I../plugins -I../include -I/usr/include/mysql -I/usr/include -Wall -W -fno-strict-aliasing -g -O2 -MT client.lo -MD -MP -MF .deps/client.Tpo -c client.c -fPIC -DPIC -o .libs/client.o
client.c:64: error: static declaration of 'global_callbacks' follows non-static declaration
saslint.h:112: error: previous declaration of 'global_callbacks' was here
make[3]: *** [client.lo] Error 1
make[3]: Leaving directory `/cyrus-sasl2-2.1.19/build-tree/cyrus-sasl-2.1.19/lib'

With the attached patch 'cyrus-sasl2' can be compiled
on amd64 using gcc-4.0.

Regards
Andreas Jochens

diff -urN ../tmp-orig/cyrus-sasl2-2.1.19/debian/patches/23_gcc4_fix.diff ./debian/patches/23_gcc4_fix.diff
--- ../tmp-orig/cyrus-sasl2-2.1.19/debian/patches/23_gcc4_fix.diff 1970-01-01 01:00:00.000000000 +0100
+++ ./debian/patches/23_gcc4_fix.diff 2004-12-14 12:47:22.459124432 +0100
@@ -0,0 +1,12 @@
+diff -urN tmp/lib/client.c cyrus-sasl-2.1.19/lib/client.c
+--- tmp/lib/client.c 2004-12-14 12:14:19.397595000 +0100
++++ cyrus-sasl-2.1.19/lib/client.c 2004-12-14 12:45:24.344080648 +0100
+@@ -61,7 +61,7 @@
+
+ static cmech_list_t *cmechlist; /* global var which holds the list */
+
+-static sasl_global_callbacks_t global_callbacks;
++sasl_global_callbacks_t global_callbacks;
+
+ static int _sasl_client_active = 0;
+