Use iface instead of interface because it might already be declared in

[tinc] / src / graph.c

diff --git a/src/graph.c b/src/graph.c
index 3692f44..147586e 100644 (file)
--- a/src/graph.c
+++ b/src/graph.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: graph.c,v 1.1.2.24 2003/07/12 17:41:45 guus Exp $
+    $Id: graph.c,v 1.1.2.26 2003/07/18 13:45:06 guus Exp $
 */
 
 /* We need to generate two trees from the graph:
@@ -44,27 +44,17 @@
    destination address and port of a node if possible.
 */
 
-#include "config.h"
-
-#include <stdio.h>
-#include <string.h>
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#include <netinet/in.h>
-
-#include <avl_tree.h>
-#include <utils.h>
+#include "system.h"
 
-#include "netutl.h"
-#include "node.h"
-#include "edge.h"
+#include "avl_tree.h"
 #include "connection.h"
-#include "process.h"
 #include "device.h"
+#include "edge.h"
 #include "logger.h"
-
-#include "system.h"
+#include "netutl.h"
+#include "node.h"
+#include "process.h"
+#include "utils.h"
 
 /* Implementation of Kruskal's algorithm.
    Running time: O(EN)
@@ -272,7 +262,7 @@ void sssp_bfs(void)
 
                        asprintf(&envp[0], "NETNAME=%s", netname ? : "");
                        asprintf(&envp[1], "DEVICE=%s", device ? : "");
-                       asprintf(&envp[2], "INTERFACE=%s", interface ? : "");
+                       asprintf(&envp[2], "INTERFACE=%s", iface ? : "");
                        asprintf(&envp[3], "NODE=%s", n->name);
                        sockaddr2str(&n->address, &address, &port);
                        asprintf(&envp[4], "REMOTEADDRESS=%s", address);