X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fxalloc.h;h=96b9592bf9f47169d2d885df2594861676d5f95d;hb=a0078603e0a05c71fc96951415fd464f8ce6ceb1;hp=d9877a8b08a37be1b56dcb22f513e495894146c1;hpb=b0ffeb7eeb21920842382c302ca15ec0d758e9b6;p=tinc

diff --git a/src/xalloc.h b/src/xalloc.h
index d9877a8b..96b9592b 100644
--- a/src/xalloc.h
+++ b/src/xalloc.h
@@ -21,7 +21,9 @@
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-static inline void *xmalloc(size_t n) __attribute__((__malloc__));
+#include "system.h"
+
+static inline void *xmalloc(size_t n) ATTR_MALLOC;
 static inline void *xmalloc(size_t n) {
 	void *p = malloc(n);
 
@@ -32,7 +34,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) ATTR_MALLOC;
 static inline void *xzalloc(size_t n) {
 	void *p = calloc(1, n);
 
@@ -53,7 +55,7 @@ static inline void *xrealloc(void *p, size_t n) {
 	return p;
 }
 
-static inline char *xstrdup(const char *s) __attribute__((__malloc__, __nonnull__));
+static inline char *xstrdup(const char *s) ATTR_MALLOC ATTR_NONNULL;
 static inline char *xstrdup(const char *s) {
 	char *p = strdup(s);
 
@@ -65,7 +67,7 @@ static inline char *xstrdup(const char *s) {
 }
 
 static inline int xvasprintf(char **strp, const char *fmt, va_list ap) {
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
 	char buf[1024];
 	int result = vsnprintf(buf, sizeof(buf), fmt, ap);
 
@@ -85,7 +87,7 @@ static inline int xvasprintf(char **strp, const char *fmt, va_list ap) {
 	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, ...) ATTR_FORMAT(printf, 2, 3);
 static inline int xasprintf(char **strp, const char *fmt, ...) {
 	va_list ap;
 	va_start(ap, fmt);