j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Correct inclusion of standard if_tun.h header file.

Browse source
This commit is contained in:
Guus Sliepen 2001-07-15 14:21:12 +00:00
parent 5dc4ade0b9
commit b3074590b1
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
m4/tuntap.m4
View file

@ -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\"", if_tun_h="\"$kerneldir/include/linux/if_tun.h\"",
[AC_TRY_COMPILE([#include <linux/if_tun.h>], [AC_TRY_COMPILE([#include <linux/if_tun.h>],
[int a = IFF_TAP;], [int a = IFF_TAP;],
if_tun_h="<linux/if_tun.h>", if_tun_h="default",
if_tun_h="no" 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 if test $tinc_cv_linux_if_tun_h != none; then
AC_DEFINE(HAVE_TUNTAP) AC_DEFINE(HAVE_TUNTAP)
AC_DEFINE_UNQUOTED(LINUX_IF_TUN_H, $tinc_cv_linux_if_tun_h) if test $tinc_cv_linux_if_tun_h != default; then
AC_SUBST(LINUX_IF_TUN_H) AC_DEFINE_UNQUOTED(LINUX_IF_TUN_H, $tinc_cv_linux_if_tun_h)
fi
fi fi
AC_SUBST(LINUX_IF_TUN_H)
AC_SUBST(HAVE_TUNTAP) AC_SUBST(HAVE_TUNTAP)
]) ])

12
src/net.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 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" #include "config.h"
@ -54,7 +54,15 @@
#endif #endif
#ifdef HAVE_TUNTAP #ifdef HAVE_TUNTAP
#include LINUX_IF_TUN_H #ifdef HAVE_LINUX
#ifdef LINUX_IF_TUN_H
#include LINUX_IF_TUN_H
#else
#include <linux/if_tun.h>
#endif
#else
#include <net/if_tun.h>
#endif
#endif #endif
#include <utils.h> #include <utils.h>