diff options
author | Darren Tucker <dtucker@zip.com.au> | 2016-07-15 14:48:30 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2016-07-15 14:54:16 +1000 |
commit | 5abfb15ced985c340359ae7fb65a625ed3692b3e (patch) | |
tree | bcde17550f213403000237c99a541ec43cae38b1 /openbsd-compat/bsd-asprintf.c | |
parent | 832b7443b7a8e181c95898bc5d73497b7190decd (diff) |
Move VA_COPY macro into compat header.
Some AIX compilers unconditionally undefine va_copy but don't set it back
to an internal function, causing link errors. In some compat code we
already use VA_COPY instead so move the two existing instances into the
shared header and use for sshbuf-getput-basic.c too. Should fix building
with at lease some versions of AIX's compiler. bz#2589, ok djm@
Diffstat (limited to 'openbsd-compat/bsd-asprintf.c')
-rw-r--r-- | openbsd-compat/bsd-asprintf.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/openbsd-compat/bsd-asprintf.c b/openbsd-compat/bsd-asprintf.c index 3368195d4..7b83448ca 100644 --- a/openbsd-compat/bsd-asprintf.c +++ b/openbsd-compat/bsd-asprintf.c | |||
@@ -25,18 +25,6 @@ | |||
25 | #include <stdarg.h> | 25 | #include <stdarg.h> |
26 | #include <stdlib.h> | 26 | #include <stdlib.h> |
27 | 27 | ||
28 | #ifndef VA_COPY | ||
29 | # ifdef HAVE_VA_COPY | ||
30 | # define VA_COPY(dest, src) va_copy(dest, src) | ||
31 | # else | ||
32 | # ifdef HAVE___VA_COPY | ||
33 | # define VA_COPY(dest, src) __va_copy(dest, src) | ||
34 | # else | ||
35 | # define VA_COPY(dest, src) (dest) = (src) | ||
36 | # endif | ||
37 | # endif | ||
38 | #endif | ||
39 | |||
40 | #define INIT_SZ 128 | 28 | #define INIT_SZ 128 |
41 | 29 | ||
42 | int | 30 | int |