-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 21/02/12 02:22, Alon Bar-Lev wrote: > > Signed-off-by: Alon Bar-Lev <alon.bar...@gmail.com> > --- > buffer.h | 12 ++++++++++-- > error.h | 6 +++++- > misc.h | 12 ++++++++++-- > status.h | 6 +++++- > 4 files changed, 30 insertions(+), 6 deletions(-) > > diff --git a/buffer.h b/buffer.h > index 6c79007..9bc33db 100644 > --- a/buffer.h > +++ b/buffer.h > @@ -312,7 +312,11 @@ has_digit (const unsigned char* src) > */ > bool buf_printf (struct buffer *buf, const char *format, ...) > #ifdef __GNUC__ > - __attribute__ ((format (printf, 2, 3))) > +#if __USE_MINGW_ANSI_STDIO > + __attribute__ ((format (gnu_printf, 2, 3))) > +#else > + __attribute__ ((format (__printf__, 2, 3))) > +#endif > #endif > ; > > @@ -326,7 +330,11 @@ bool buf_puts (struct buffer *buf, const char *str); > */ > bool openvpn_snprintf(char *str, size_t size, const char *format, ...) > #ifdef __GNUC__ > - __attribute__ ((format (printf, 3, 4))) > +#if __USE_MINGW_ANSI_STDIO > + __attribute__ ((format (gnu_printf, 3, 4))) > +#else > + __attribute__ ((format (__printf__, 3, 4))) > +#endif > #endif > ; > > diff --git a/error.h b/error.h > index aafd055..d2c04b0 100644 > --- a/error.h > +++ b/error.h > @@ -178,7 +178,11 @@ bool dont_mute (unsigned int flags); /* check muting > filter */ > > void x_msg (const unsigned int flags, const char *format, ...) > #ifdef __GNUC__ > - __attribute__ ((format (printf, 2, 3))) > +#if __USE_MINGW_ANSI_STDIO > + __attribute__ ((format (gnu_printf, 2, 3))) > +#else > + __attribute__ ((format (__printf__, 2, 3))) > +#endif > #endif > ; /* should be called via msg above */ > > diff --git a/misc.h b/misc.h > index bdada42..5df8cec 100644 > --- a/misc.h > +++ b/misc.h > @@ -435,13 +435,21 @@ void argv_printf_arglist (struct argv *a, const char > *format, const unsigned int > > void argv_printf (struct argv *a, const char *format, ...) > #ifdef __GNUC__ > - __attribute__ ((format (printf, 2, 3))) > +#if __USE_MINGW_ANSI_STDIO > + __attribute__ ((format (gnu_printf, 2, 3))) > +#else > + __attribute__ ((format (__printf__, 2, 3))) > +#endif > #endif > ; > > void argv_printf_cat (struct argv *a, const char *format, ...) > #ifdef __GNUC__ > - __attribute__ ((format (printf, 2, 3))) > +#if __USE_MINGW_ANSI_STDIO > + __attribute__ ((format (gnu_printf, 2, 3))) > +#else > + __attribute__ ((format (__printf__, 2, 3))) > +#endif > #endif > ; > > diff --git a/status.h b/status.h > index 0bdad4e..af16fd2 100644 > --- a/status.h > +++ b/status.h > @@ -77,7 +77,11 @@ void status_flush (struct status_output *so); > bool status_close (struct status_output *so); > void status_printf (struct status_output *so, const char *format, ...) > #ifdef __GNUC__ > - __attribute__ ((format (printf, 2, 3))) > +#if __USE_MINGW_ANSI_STDIO > + __attribute__ ((format (gnu_printf, 2, 3))) > +#else > + __attribute__ ((format (__printf__, 2, 3))) > +#endif > #endif > ; >
ACK! kind regards, David Sommerseth -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk9LSM0ACgkQDC186MBRfrqI/QCePqdjVuyvhqEBEXcJb8IHaoBr dL4AoJnbRxUayMqsg17JgTb5CcQ1FsIV =S8gc -----END PGP SIGNATURE-----
