projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
When exporting configuration files, don't copy Name variables.
[tinc]
/
have.h
diff --git
a/have.h
b/have.h
index
49af861
..
d47f204
100644
(file)
--- a/
have.h
+++ b/
have.h
@@
-1,7
+1,7
@@
/*
have.h -- include headers which are known to exist
Copyright (C) 1998-2005 Ivo Timmermans
/*
have.h -- include headers which are known to exist
Copyright (C) 1998-2005 Ivo Timmermans
- 2003-20
09
Guus Sliepen <guus@tinc-vpn.org>
+ 2003-20
11
Guus Sliepen <guus@tinc-vpn.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
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
@@
-21,6
+21,15
@@
#ifndef __TINC_HAVE_H__
#define __TINC_HAVE_H__
#ifndef __TINC_HAVE_H__
#define __TINC_HAVE_H__
+#ifdef HAVE_MINGW
+#ifdef WITH_WINDOWS2000
+#define WINVER Windows2000
+#else
+#define WINVER WindowsXP
+#endif
+#define WIN32_LEAN_AND_MEAN
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
@@
-32,12
+41,8
@@
#include <unistd.h>
#ifdef HAVE_MINGW
#include <unistd.h>
#ifdef HAVE_MINGW
-#ifdef WITH_WINDOWS2000
-#define WINVER Windows2000
-#else
-#define WINVER WindowsXP
-#endif
#include <w32api.h>
#include <w32api.h>
+#include <winsock2.h>
#include <windows.h>
#include <ws2tcpip.h>
#endif
#include <windows.h>
#include <ws2tcpip.h>
#endif
@@
-54,10
+59,6
@@
#include <inttypes.h>
#endif
#include <inttypes.h>
#endif
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-
/* Include system specific headers */
#ifdef HAVE_SYSLOG_H
/* Include system specific headers */
#ifdef HAVE_SYSLOG_H
@@
-96,10
+97,22
@@
#include <sys/param.h>
#endif
#include <sys/param.h>
#endif
+#ifdef HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#endif
+
#ifdef HAVE_SYS_UIO_H
#include <sys/uio.h>
#endif
#ifdef HAVE_SYS_UIO_H
#include <sys/uio.h>
#endif
+#ifdef HAVE_SYS_UN_H
+#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. */
/* SunOS really wants sys/socket.h BEFORE net/if.h,
and FreeBSD wants these lines below the rest. */
@@
-123,10
+136,18
@@
#include <net/if_tun.h>
#endif
#include <net/if_tun.h>
#endif
+#ifdef HAVE_NET_TUN_IF_TUN_H
+#include <net/tun/if_tun.h>
+#endif
+
#ifdef HAVE_NET_IF_TAP_H
#include <net/if_tap.h>
#endif
#ifdef HAVE_NET_IF_TAP_H
#include <net/if_tap.h>
#endif
+#ifdef HAVE_NET_TAP_IF_TAP_H
+#include <net/tap/if_tap.h>
+#endif
+
#ifdef HAVE_NETINET_IN_SYSTM_H
#include <netinet/in_systm.h>
#endif
#ifdef HAVE_NETINET_IN_SYSTM_H
#include <netinet/in_systm.h>
#endif
@@
-175,4
+196,8
@@
#include <netinet/if_ether.h>
#endif
#include <netinet/if_ether.h>
#endif
+#ifdef HAVE_EVENT_H
+#include <event.h>
+#endif
+
#endif /* __TINC_SYSTEM_H__ */
#endif /* __TINC_SYSTEM_H__ */