X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;ds=sidebyside;f=src%2Fxalloc.h;h=9d3a71e5f5992ef9c6e0fbd6bb620c9edbdd9c2a;hb=985d19caf20058db3c764f0f6fbeafa8bcc59fcc;hp=e75f1bb5f3165b790643e5e8d936dacac39c1512;hpb=4fe3688bc68f77686d2061ee9240509e7158441c;p=tinc

diff --git a/src/xalloc.h b/src/xalloc.h
index e75f1bb5..9d3a71e5 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) {
@@ -54,7 +55,7 @@ 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);
+	int result = vsnprintf(buf, sizeof(buf), fmt, ap);
 	if(result < 0)
 		abort();
 	*strp = xstrdup(buf);