diff options
author | Russ Allbery <rra@dropbox.com> | 2016-02-03 12:44:33 -0800 |
---|---|---|
committer | Russ Allbery <rra@dropbox.com> | 2016-02-03 12:44:33 -0800 |
commit | 2a53df4444cb8a931e82c584288025e315f40121 (patch) | |
tree | 7c8b9bfa69cf613a22ba6be616a0d3fdb4146e4e /portable/asprintf.c | |
parent | 294d46a917b6aa3af305c3d50b8d83a1f3fb5694 (diff) | |
parent | e64d4e31146b87046916c377557f8ea789da3f0a (diff) |
Merge branch 'debian/master' into ubuntu/precise
Diffstat (limited to 'portable/asprintf.c')
-rw-r--r-- | portable/asprintf.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/portable/asprintf.c b/portable/asprintf.c index eb2b713..9693842 100644 --- a/portable/asprintf.c +++ b/portable/asprintf.c @@ -19,6 +19,7 @@ */ #include <config.h> +#include <portable/macros.h> #include <portable/system.h> #include <errno.h> @@ -28,11 +29,14 @@ * with the system versions. */ #if TESTING +# undef asprintf +# undef vasprintf # define asprintf test_asprintf # define vasprintf test_vasprintf int test_asprintf(char **, const char *, ...) __attribute__((__format__(printf, 2, 3))); -int test_vasprintf(char **, const char *, va_list); +int test_vasprintf(char **, const char *, va_list) + __attribute__((__format__(printf, 2, 0))); #endif |