Assign more suitable types and fix narrowing conversion warns.

[tinc] / src / xalloc.h

diff --git a/src/xalloc.h b/src/xalloc.h
index d9877a8..33f30d0 100644 (file)
--- a/src/xalloc.h
+++ b/src/xalloc.h
@@ -21,6 +21,8 @@
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#include "system.h"
+
 static inline void *xmalloc(size_t n) __attribute__((__malloc__));
 static inline void *xmalloc(size_t n) {
        void *p = malloc(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) __attribute__((__malloc__)) __attribute((__nonnull__));
 static inline char *xstrdup(const char *s) {
        char *p = strdup(s);