X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fxalloc.h;h=28960fbd4e06efccb19ba01a5dfc49c32da353fd;hp=397f7b0e19bfce88f8034024547278bb721b32ad;hb=abb24e9d71b3edb9cacf4c04361cc0dfd4e6a061;hpb=5b07039b0712bee0f19749d63116a10fb08a2d8b

diff --git a/src/xalloc.h b/src/xalloc.h
index 397f7b0e..28960fbd 100644
--- a/src/xalloc.h
+++ b/src/xalloc.h
@@ -20,6 +20,7 @@
 #ifndef __TINC_XALLOC_H__
 #define __TINC_XALLOC_H__
 
+static inline void *xmalloc(size_t n) __attribute__ ((__malloc__));
 static inline void *xmalloc(size_t n) {
 	void *p = malloc(n);
 	if(!p)
@@ -27,6 +28,7 @@ static inline void *xmalloc(size_t n) {
 	return p;
 }
 
+static inline void *xzalloc(size_t n) __attribute__ ((__malloc__));
 static inline void *xzalloc(size_t n) {
 	void *p = calloc(1, n);
 	if(!p)
@@ -41,6 +43,7 @@ static inline void *xrealloc(void *p, size_t n) {
 	return p;
 }
 
+static inline char *xstrdup(const char *s) __attribute__ ((__malloc__));
 static inline char *xstrdup(const char *s) {
 	char *p = strdup(s);
 	if(!p)
@@ -49,12 +52,21 @@ 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;
 }
 
+static inline int xasprintf(char **strp, const char *fmt, ...) __attribute__ ((__format__(printf, 2, 3)));
 static inline int xasprintf(char **strp, const char *fmt, ...) {
 	va_list ap;
 	va_start(ap, fmt);