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 /www/clearsilver | |
| 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 'www/clearsilver')
| -rw-r--r-- | www/clearsilver/distinfo | 3 | ||||
| -rw-r--r-- | www/clearsilver/patches/patch-util_neo__err.h | 29 |
2 files changed, 31 insertions, 1 deletions
diff --git a/www/clearsilver/distinfo b/www/clearsilver/distinfo index 53dd2dffd4e..b52511855bd 100644 --- a/www/clearsilver/distinfo +++ b/www/clearsilver/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2011/12/01 20:50:48 gls Exp $ +$NetBSD: distinfo,v 1.17 2012/12/22 02:25:56 joerg Exp $ SHA1 (clearsilver-0.10.5.tar.gz) = 138865dc91e27328fe29fcaaac1bc6558f19dd75 RMD160 (clearsilver-0.10.5.tar.gz) = bd5c616f326b544df8a74eec71a98a474b408249 @@ -7,3 +7,4 @@ SHA1 (patch-aa) = cf8708c4bee271d39eca2b1833302fa13aee2b6d SHA1 (patch-ae) = 58326210ecef3936579a19f3cbcb9b9374bc3541 SHA1 (patch-af) = e88106bb0c57d632c348bc16ff673e0ef7487847 SHA1 (patch-python_neo__cgi.c) = 0baf7f06bdf7c5686131b1b1abbd4fb0fef11c85 +SHA1 (patch-util_neo__err.h) = 599f4d34b958cbdfb673e9b68409eeea5c1861aa diff --git a/www/clearsilver/patches/patch-util_neo__err.h b/www/clearsilver/patches/patch-util_neo__err.h new file mode 100644 index 00000000000..451d3e63742 --- /dev/null +++ b/www/clearsilver/patches/patch-util_neo__err.h @@ -0,0 +1,29 @@ +$NetBSD: patch-util_neo__err.h,v 1.1 2012/12/22 02:25:57 joerg Exp $ + +Dropping the comma before __VA_ARGS__ when the list is empty is a GCC +language extension. + +--- util/neo_err.h.orig 2012-12-21 19:08:49.000000000 +0000 ++++ util/neo_err.h +@@ -84,8 +84,8 @@ typedef struct _neo_err + * NEOERR fails + */ + #if defined(USE_C99_VARARG_MACROS) +-#define nerr_raise(e,f,...) \ +- nerr_raisef(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,__VA_ARGS__) ++#define nerr_raise(e,...) \ ++ nerr_raisef(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,__VA_ARGS__) + #elif defined(USE_GNUC_VARARG_MACROS) + #define nerr_raise(e,f,a...) \ + nerr_raisef(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,##a) +@@ -98,8 +98,8 @@ NEOERR *nerr_raisef (const char *func, c + + + #if defined(USE_C99_VARARG_MACROS) +-#define nerr_raise_errno(e,f,...) \ +- nerr_raise_errnof(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,__VA_ARGS__) ++#define nerr_raise_errno(e,...) \ ++ nerr_raise_errnof(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,__VA_ARGS__) + #elif defined(USE_GNUC_VARARG_MACROS) + #define nerr_raise_errno(e,f,a...) \ + nerr_raise_errnof(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,##a) |