projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Really avoid trying to send an ANS_KEY request to unreachable nodes.
[tinc]
/
src
/
have.h
diff --git
a/src/have.h
b/src/have.h
index
9dc3b04
..
bb23662
100644
(file)
--- a/
src/have.h
+++ b/
src/have.h
@@
-1,7
+1,10
@@
+#ifndef TINC_HAVE_H
+#define TINC_HAVE_H
+
/*
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
13
Guus Sliepen <guus@tinc-vpn.org>
+ 2003-20
21
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
@@
-18,21
+21,15
@@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef __TINC_HAVE_H__
-#define __TINC_HAVE_H__
-
#ifdef HAVE_MINGW
#ifdef HAVE_MINGW
-#ifdef WITH_WINDOWS2000
-#define WINVER Windows2000
-#else
#define WINVER WindowsXP
#define WINVER WindowsXP
-#endif
#define WIN32_LEAN_AND_MEAN
#endif
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
#define WIN32_LEAN_AND_MEAN
#endif
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
+#include <stdbool.h>
#include <string.h>
#include <ctype.h>
#include <signal.h>
#include <string.h>
#include <ctype.h>
#include <signal.h>
@@
-41,6
+38,7
@@
#include <unistd.h>
#include <limits.h>
#include <math.h>
#include <unistd.h>
#include <limits.h>
#include <math.h>
+#include <time.h>
#ifdef HAVE_MINGW
#include <w32api.h>
#ifdef HAVE_MINGW
#include <w32api.h>
@@
-49,10
+47,6
@@
#include <ws2tcpip.h>
#endif
#include <ws2tcpip.h>
#endif
-#ifdef HAVE_STDBOOL_H
-#include <stdbool.h>
-#endif
-
#ifdef HAVE_TERMIOS_H
#include <termios.h>
#endif
#ifdef HAVE_TERMIOS_H
#include <termios.h>
#endif
@@
-63,6
+57,10
@@
/* Include system specific headers */
/* Include system specific headers */
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
+
#ifdef HAVE_SYSLOG_H
#include <syslog.h>
#endif
#ifdef HAVE_SYSLOG_H
#include <syslog.h>
#endif
@@
-71,9
+69,6
@@
#include <sys/time.h>
#endif
#include <sys/time.h>
#endif
-#ifdef HAVE_TIME_H
-#include <time.h>
-#endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@
-103,10
+98,6
@@
#include <sys/resource.h>
#endif
#include <sys/resource.h>
#endif
-#ifdef HAVE_SYS_UIO_H
-#include <sys/uio.h>
-#endif
-
#ifdef HAVE_SYS_UN_H
#include <sys/un.h>
#endif
#ifdef HAVE_SYS_UN_H
#include <sys/un.h>
#endif
@@
-206,6
+197,16
@@
#include <resolv.h>
#endif
#include <resolv.h>
#endif
+#ifdef HAVE_LINUX_IF_TUN_H
+#include <linux/if_tun.h>
+#endif
+
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#else
+#include "getopt.h"
+#endif
+
#ifdef STATUS
#undef STATUS
#endif
#ifdef STATUS
#undef STATUS
#endif
@@
-216,4
+217,4
@@
#define SLASH "/"
#endif
#define SLASH "/"
#endif
-#endif
/* __TINC_SYSTEM_H__ */
+#endif