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

[tinc] / src / device.h

diff --git a/src/device.h b/src/device.h
index 05dcaaa..4dce250 100644 (file)
--- a/src/device.h
+++ b/src/device.h
@@ -1,7 +1,7 @@
 /*
     net.h -- generic header for device.c
-    Copyright (C) 2001 Ivo Timmermans <zarq@iname.com>
-                  2001 Guus Sliepen <guus@sliepen.warande.net>
+    Copyright (C) 2001-2003 Ivo Timmermans <zarq@iname.com>
+                  2001-2003 Guus Sliepen <guus@sliepen.eu.org>
 
     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,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: device.h,v 1.1.2.4 2001/10/31 12:50:24 guus Exp $
+    $Id: device.h,v 1.1.2.10 2003/07/18 13:45:06 guus Exp $
 */
 
 #ifndef __TINC_DEVICE_H__
@@ -25,7 +25,8 @@
 
 extern int device_fd;
 extern char *device;
-extern char *interface;
+
+extern char *iface;
 
 extern int setup_device(void);
 extern void close_device(void);
@@ -33,4 +34,4 @@ extern int read_packet(vpn_packet_t *);
 extern int write_packet(vpn_packet_t *);
 extern void dump_device_stats(void);
 
-#endif /* __TINC_DEVICE_H__ */
+#endif                                                 /* __TINC_DEVICE_H__ */