From b3074590b184c141419cf4926820dc0d78380535 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Sun, 15 Jul 2001 14:21:12 +0000 Subject: [PATCH] Correct inclusion of standard if_tun.h header file. --- m4/tuntap.m4 | 8 +++++--- src/net.c | 12 ++++++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/m4/tuntap.m4 b/m4/tuntap.m4 index 147c6794..0bee1ce3 100644 --- a/m4/tuntap.m4 +++ b/m4/tuntap.m4 @@ -16,7 +16,7 @@ AC_CACHE_CHECK([for linux/if_tun.h], tinc_cv_linux_if_tun_h, if_tun_h="\"$kerneldir/include/linux/if_tun.h\"", [AC_TRY_COMPILE([#include ], [int a = IFF_TAP;], - if_tun_h="", + if_tun_h="default", if_tun_h="no" )] ) @@ -30,8 +30,10 @@ AC_CACHE_CHECK([for linux/if_tun.h], tinc_cv_linux_if_tun_h, if test $tinc_cv_linux_if_tun_h != none; then AC_DEFINE(HAVE_TUNTAP) - AC_DEFINE_UNQUOTED(LINUX_IF_TUN_H, $tinc_cv_linux_if_tun_h) - AC_SUBST(LINUX_IF_TUN_H) + if test $tinc_cv_linux_if_tun_h != default; then + AC_DEFINE_UNQUOTED(LINUX_IF_TUN_H, $tinc_cv_linux_if_tun_h) + fi fi +AC_SUBST(LINUX_IF_TUN_H) AC_SUBST(HAVE_TUNTAP) ]) diff --git a/src/net.c b/src/net.c index 309079b8..4c5956e8 100644 --- a/src/net.c +++ b/src/net.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: net.c,v 1.35.4.118 2001/07/04 08:41:36 guus Exp $ + $Id: net.c,v 1.35.4.119 2001/07/15 14:21:12 guus Exp $ */ #include "config.h" @@ -54,7 +54,15 @@ #endif #ifdef HAVE_TUNTAP -#include LINUX_IF_TUN_H + #ifdef HAVE_LINUX + #ifdef LINUX_IF_TUN_H + #include LINUX_IF_TUN_H + #else + #include + #endif + #else + #include + #endif #endif #include -- 2.39.5