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

Merge branch 'master' into 1.1

Browse source 
Conflicts:
	NEWS
	README
	configure.in
	have.h
	src/conf.c
	src/conf.h
	src/net.c
	src/net_packet.c
	src/protocol_key.c
	src/protocol_subnet.c
	src/route.c
	src/tincd.c
This commit is contained in:
Sven-Haegar Koch 2010-03-26 16:51:03 +01:00
commit 103543aa2c
27 changed files with 694 additions and 237 deletions
Download patch file Download diff file Expand all files Collapse all files

4
have.h
View file

@ -105,6 +105,10 @@
#include <sys/un.h>
#endif
#ifdef HAVE_DIRENT_H
#include <dirent.h>
#endif
/* SunOS really wants sys/socket.h BEFORE net/if.h,
and FreeBSD wants these lines below the rest. */