diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-08 10:54:13 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-08 10:54:13 -0300 |
| commit | e0981df8c5fce1353e1499a5085e27f92afddcea (patch) | |
| tree | 06de6ad8de74d4b7b040d67f050c1fd43fe83a33 /testing/libsasl/0022_gcc4.4_preprocessor_syntax.patch | |
| parent | 97a74a6a87ccbeb5649f226377d0c10ae824f1e1 (diff) | |
| parent | 0f9e4ba23bb6296d8bb8010f70d868fd08db9c54 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/curlftpfs/PKGBUILD
core/libcap/PKGBUILD
core/libsasl/PKGBUILD
core/udev/PKGBUILD
extra/cyrus-sasl/PKGBUILD
extra/dbus/PKGBUILD
extra/fluidsynth/PKGBUILD
extra/mercurial/PKGBUILD
extra/redland/PKGBUILD
extra/soprano/PKGBUILD
multilib/lib32-curl/PKGBUILD
multilib/lib32-freetype2/PKGBUILD
multilib/lib32-mesa/PKGBUILD
multilib/wine/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, |