diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-13 14:21:34 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-13 14:21:34 -0300 |
| commit | 4a47b2a0e019de14d474e353a601ca6bf47e90e5 (patch) | |
| tree | 69e20048be17aa12e6342ebcafb0cf9cdbfee32d /testing/libsasl/0022_gcc4.4_preprocessor_syntax.patch | |
| parent | 149750d28420a7b59fab5501ab9aaca095f6fa46 (diff) | |
| parent | b5f690637837ff269bf5d248ee2dc37ea5236ca8 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/packagekit/PKGBUILD
community/bird/PKGBUILD
community/camlp5/PKGBUILD
community/exim/PKGBUILD
community/ibus-table-extraphrase/PKGBUILD
community/mingw32-gcc-base/PKGBUILD
community/mingw32-gcc/PKGBUILD
community/torcs/PKGBUILD
core/db/PKGBUILD
core/iproute2/PKGBUILD
core/libsasl/PKGBUILD
core/openldap/PKGBUILD
core/pam/PKGBUILD
core/util-linux/PKGBUILD
extra/cyrus-sasl/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/kdelibs/PKGBUILD
extra/libreoffice/PKGBUILD
extra/php/PKGBUILD
extra/postfix/PKGBUILD
extra/python-lxml/PKGBUILD
extra/rdesktop/PKGBUILD
extra/redland/PKGBUILD
extra/subversion/PKGBUILD
extra/tidyhtml/PKGBUILD
extra/transmission/PKGBUILD
extra/windowmaker/PKGBUILD
kde-unstable/calligra/PKGBUILD
multilib/lib32-libdrm/PKGBUILD
multilib/lib32-libdrm/no-pthread-stubs.patch
multilib/lib32-openssl/PKGBUILD
Diffstat (limited to 'testing/libsasl/0022_gcc4.4_preprocessor_syntax.patch')
| -rw-r--r-- | testing/libsasl/0022_gcc4.4_preprocessor_syntax.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/testing/libsasl/0022_gcc4.4_preprocessor_syntax.patch b/testing/libsasl/0022_gcc4.4_preprocessor_syntax.patch new file mode 100644 index 000000000..a49b553f0 --- /dev/null +++ b/testing/libsasl/0022_gcc4.4_preprocessor_syntax.patch @@ -0,0 +1,26 @@ +0022_gcc4.4_preprocessor_syntax.dpatch by <fabbe@paniq.net> + +The #elif preprocessor directive requires a test condition. +GCC 4.4 enforces this rule. + +diff -urNad trunk~/plugins/digestmd5.c trunk/plugins/digestmd5.c +--- trunk~/plugins/digestmd5.c 2006-06-04 12:26:19.000000000 +0300 ++++ trunk/plugins/digestmd5.c 2009-01-26 13:29:40.000000000 +0200 +@@ -2715,7 +2715,7 @@ + "DIGEST-MD5", /* mech_name */ + #ifdef WITH_RC4 + 128, /* max_ssf */ +-#elif WITH_DES ++#elif defined(WITH_DES) + 112, + #else + 1, +@@ -4034,7 +4034,7 @@ + "DIGEST-MD5", + #ifdef WITH_RC4 /* mech_name */ + 128, /* max ssf */ +-#elif WITH_DES ++#elif defined(WITH_DES) + 112, + #else + 1, |