diff options
| author | joerg <joerg> | 2012-12-22 02:25:56 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2012-12-22 02:25:56 +0000 |
| commit | a57d5fad8bb555aa5c9453fc4229ef1265005b8c (patch) | |
| tree | b2f3fb45cda28b844fadd3ec2f4c1364c951d5ad /mail | |
| parent | ca8acab5dc7def5091405d976f97b1fe3d626f2d (diff) | |
| download | pkgsrc-a57d5fad8bb555aa5c9453fc4229ef1265005b8c.tar.gz | |
Using __VA_ARGS__ and expecting the compiler to magically remove the
initial comma when it expands to empty is a GCC extension. Avoid it.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/libspf2/distinfo | 3 | ||||
| -rw-r--r-- | mail/libspf2/patches/patch-src_include_spf__log.h | 21 |
2 files changed, 23 insertions, 1 deletions
diff --git a/mail/libspf2/distinfo b/mail/libspf2/distinfo index 17c56afac56..6e84bc52a6a 100644 --- a/mail/libspf2/distinfo +++ b/mail/libspf2/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.4 2009/09/08 10:36:27 tron Exp $ +$NetBSD: distinfo,v 1.5 2012/12/22 02:25:57 joerg Exp $ SHA1 (libspf2-1.2.9.tar.gz) = 15dfe3b9172180654f4de4dd85f3f01e3bc11503 RMD160 (libspf2-1.2.9.tar.gz) = d0754d47e297a00038e4185e17704a24d38a4888 Size (libspf2-1.2.9.tar.gz) = 518001 bytes SHA1 (patch-aa) = 81f60333222b510cb511b80aedbb679d2212ab0d +SHA1 (patch-src_include_spf__log.h) = 87b534d338b7fa36168cf8b745a285e38598cfed diff --git a/mail/libspf2/patches/patch-src_include_spf__log.h b/mail/libspf2/patches/patch-src_include_spf__log.h new file mode 100644 index 00000000000..d77b4c12bb3 --- /dev/null +++ b/mail/libspf2/patches/patch-src_include_spf__log.h @@ -0,0 +1,21 @@ +$NetBSD: patch-src_include_spf__log.h,v 1.1 2012/12/22 02:25:57 joerg Exp $ + +Dropping a trailing comma when __VA_ARGS__ would be empty is a GCC extension. + +--- src/include/spf_log.h.orig 2012-12-21 21:29:20.000000000 +0000 ++++ src/include/spf_log.h +@@ -60,10 +60,10 @@ void SPF_debugv( const char *file, int l + + #if defined( __STDC_VERSION__ ) && __STDC_VERSION__ >= 199901L + +-#define SPF_errorf(format, ... ) SPF_errorx( __FILE__, __LINE__, format, __VA_ARGS__ ) +-#define SPF_warningf(format, ... ) SPF_warningx( __FILE__, __LINE__, format, __VA_ARGS__ ) +-#define SPF_infof(format, ... ) SPF_infox( __FILE__, __LINE__, format, __VA_ARGS__ ) +-#define SPF_debugf(format, ... ) SPF_debugx( __FILE__, __LINE__, format, __VA_ARGS__ ) ++#define SPF_errorf(...) SPF_errorx( __FILE__, __LINE__, __VA_ARGS__ ) ++#define SPF_warningf(...) SPF_warningx( __FILE__, __LINE__, __VA_ARGS__ ) ++#define SPF_infof(...) SPF_infox( __FILE__, __LINE__, __VA_ARGS__ ) ++#define SPF_debugf(...) SPF_debugx( __FILE__, __LINE__, __VA_ARGS__ ) + + #elif defined( __GNUC__ ) + |