The name errno conflicts with the real errno: ‘__errno_location’ declared as a function

[meshlink] / src / event.h

diff --git a/src/event.h b/src/event.h
index c6522c0ea006d5ed35d5d5c06e615258889373e7..7d52a174fa874f8b460a5645e6cb234495685393 100644 (file)
--- a/src/event.h
+++ b/src/event.h
@@ -1,6 +1,6 @@
 /*
     event.h -- I/O, timeout and signal event handling
-    Copyright (C) 2012-2013 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2014 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
@@ -34,21 +34,21 @@ typedef struct io_t {
        int flags;
        io_cb_t cb;
        void *data;
-       splay_node_t node;
+       struct splay_node_t node;
 } io_t;
 
 typedef struct timeout_t {
        struct timeval tv;
        timeout_cb_t cb;
        void *data;
-       splay_node_t node;
+       struct splay_node_t node;
 } timeout_t;
 
 typedef struct signal_t {
        int signum;
        signal_cb_t cb;
        void *data;
-       splay_node_t node;
+       struct splay_node_t node;
 } signal_t;
 
 extern struct timeval now;