summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2009-05-08 00:58:59 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2009-05-08 00:58:59 +0000
commit9526c9e5b4af8ab507409b4126ed161505496775 (patch)
tree38fd3636b6b8d7fc285d7310b0eb1f63b3399c56 /dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-gcc44.patch
parentFix bug 268788, Function 'g_volume_monitor_adopt_orphan_mount' implicitly con... (diff)
downloadgentoo-2-9526c9e5b4af8ab507409b4126ed161505496775.tar.gz
gentoo-2-9526c9e5b4af8ab507409b4126ed161505496775.tar.bz2
gentoo-2-9526c9e5b4af8ab507409b4126ed161505496775.zip
Fix gcc-4.4 compatibility, bug 248738. Thanks to dirtyepic for the patch.
(Portage version: 2.2_rc28/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-gcc44.patch')
-rw-r--r--dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-gcc44.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-gcc44.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-gcc44.patch
new file mode 100644
index 000000000000..0d4d2d2eac48
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-gcc44.patch
@@ -0,0 +1,23 @@
+Bug #248738
+
+diff -Naurp cyrus-sasl-2.1.22-orig/plugins/digestmd5.c cyrus-sasl-2.1.22/plugins/digestmd5.c
+--- cyrus-sasl-2.1.22-orig/plugins/digestmd5.c 2006-05-17 10:46:17.000000000 -0600
++++ cyrus-sasl-2.1.22/plugins/digestmd5.c 2008-11-24 23:39:11.000000000 -0600
+@@ -2715,7 +2715,7 @@ static sasl_server_plug_t digestmd5_serv
+ "DIGEST-MD5", /* mech_name */
+ #ifdef WITH_RC4
+ 128, /* max_ssf */
+-#elif WITH_DES
++#elif defined(WITH_DES)
+ 112,
+ #else
+ 1,
+@@ -4034,7 +4034,7 @@ static sasl_client_plug_t digestmd5_clie
+ "DIGEST-MD5",
+ #ifdef WITH_RC4 /* mech_name */
+ 128, /* max ssf */
+-#elif WITH_DES
++#elif defined(WITH_DES)
+ 112,
+ #else
+ 1,