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

Merge branch 'master' into 1.1

Browse source 
Conflicts:
	have.h
	lib/dropin.c
	lib/fake-getaddrinfo.c
	lib/pidfile.c
	src/Makefile.am
	src/bsd/device.c
	src/conf.c
	src/connection.c
	src/connection.h
	src/graph.c
	src/mingw/device.c
	src/net.c
	src/net_setup.c
	src/node.c
	src/protocol_key.c
	src/protocol_misc.c
	src/tincd.c
This commit is contained in:
Guus Sliepen 2009-09-16 19:55:47 +02:00
commit 075e6828a7
43 changed files with 1094 additions and 306 deletions
Download patch file Download diff file Expand all files Collapse all files

20
have.h
View file

@ -31,6 +31,17 @@
#include <fcntl.h>
#include <unistd.h>
#ifdef HAVE_MINGW
#ifdef WITH_WINDOWS2000
#define WINVER Windows2000
#else
#define WINVER WindowsXP
#endif
#include <w32api.h>
#include <windows.h>
#include <ws2tcpip.h>
#endif
#ifdef HAVE_STDBOOL_H
#include <stdbool.h>
#endif
@ -164,13 +175,4 @@
#include <netinet/if_ether.h>
#endif
#ifdef HAVE_MINGW
#include <windows.h>
#include <winsock2.h>
#endif
#ifdef HAVE_LIBEVENT
#include <event.h>
#endif
#endif /* __TINC_SYSTEM_H__ */