X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fxalloc.h;h=34dac3ccfe260b988fb33abce72b71f3f2508eff;hb=5822f817aa802c2c5a83e9d99a8ae78cb822799b;hp=6629b60b9ce869d81a773531be6e1473e77edf81;hpb=ad93dc3a4b89799e8d5c1154e1dacc5b9a31c83b;p=tinc diff --git a/src/xalloc.h b/src/xalloc.h index 6629b60b..34dac3cc 100644 --- a/src/xalloc.h +++ b/src/xalloc.h @@ -1,3 +1,6 @@ +#ifndef TINC_XALLOC_H +#define TINC_XALLOC_H + /* xalloc.h -- malloc and related fuctions with out of memory checking Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc. @@ -15,10 +18,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - -#ifndef __TINC_XALLOC_H__ -#define __TINC_XALLOC_H__ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +*/ static inline void *xmalloc(size_t n) __attribute__ ((__malloc__)); static inline void *xmalloc(size_t n) { @@ -52,9 +53,17 @@ static inline char *xstrdup(const char *s) { } static inline int xvasprintf(char **strp, const char *fmt, va_list ap) { +#ifdef HAVE_MINGW + char buf[1024]; + int result = vsnprintf(buf, sizeof buf, fmt, ap); + if(result < 0) + abort(); + *strp = xstrdup(buf); +#else int result = vasprintf(strp, fmt, ap); if(result < 0) abort(); +#endif return result; }