Automatically configure and compile catta.

[meshlink] / src / xalloc.h

diff --git a/src/xalloc.h b/src/xalloc.h
index fba0be90f7442c75b8079ec6b047517384c50c99..e521d64a203d3b82c98a6c6e08d7510db24a832c 100644 (file)
--- a/src/xalloc.h
+++ b/src/xalloc.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_XALLOC_H
+#define MESHLINK_XALLOC_H
+
 /*
    xalloc.h -- malloc and related fuctions with out of memory checking
-   Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+   Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,9 +20,6 @@
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __MESHLINK_XALLOC_H__
-#define __MESHLINK_XALLOC_H__
-
 static inline void *xmalloc(size_t n) __attribute__((__malloc__));
 static inline void *xmalloc(size_t n) {
        void *p = malloc(n);
@@ -54,7 +54,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);