chiark
/
gitweb
/
~ianmdlvl
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Import release 0.1.14
[secnet.git]
/
config.h.in
diff --git
a/config.h.in
b/config.h.in
index 1984cee58db302bc3c587915535b3fc0c1a6cdc9..8492df2eed112f17c69b9af163fc3d578fa117ad 100644
(file)
--- a/
config.h.in
+++ b/
config.h.in
@@
-1,4
+1,4
@@
-/* config.h.in. Generated automatically from configure.in by autoheader. */
+/* config.h.in. Generated automatically from configure.in by autoheader
2.13
. */
#ifndef _CONFIG_H
#define _CONFIG_H
#ifndef _CONFIG_H
#define _CONFIG_H
@@
-59,9
+59,24
@@
/* Define if you have the <linux/if.h> header file. */
#undef HAVE_LINUX_IF_H
/* Define if you have the <linux/if.h> header file. */
#undef HAVE_LINUX_IF_H
+/* Define if you have the <net/if.h> header file. */
+#undef HAVE_NET_IF_H
+
+/* Define if you have the <net/if_tun.h> header file. */
+#undef HAVE_NET_IF_TUN_H
+
+/* Define if you have the <net/route.h> header file. */
+#undef HAVE_NET_ROUTE_H
+
/* Define if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
/* Define if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
+/* Define if you have the <stropts.h> header file. */
+#undef HAVE_STROPTS_H
+
+/* Define if you have the <sys/sockio.h> header file. */
+#undef HAVE_SYS_SOCKIO_H
+
/* Define if you have the adns library (-ladns). */
#undef HAVE_LIBADNS
/* Define if you have the adns library (-ladns). */
#undef HAVE_LIBADNS
@@
-79,6
+94,15
@@
/* Define if you have the gnugetopt library (-lgnugetopt). */
#undef HAVE_LIBGNUGETOPT
/* Define if you have the gnugetopt library (-lgnugetopt). */
#undef HAVE_LIBGNUGETOPT
+
+/* Define if you have the nsl library (-lnsl). */
+#undef HAVE_LIBNSL
+
+/* Define if you have the resolv library (-lresolv). */
+#undef HAVE_LIBRESOLV
+
+/* Define if you have the socket library (-lsocket). */
+#undef HAVE_LIBSOCKET
/* -*- c -*- */
/* These are from config.h.bot, pasted onto the end of config.h.in. */
/* -*- c -*- */
/* These are from config.h.bot, pasted onto the end of config.h.in. */
@@
-91,8
+115,10
@@
#else
#if SIZEOF_UNSIGNED_LONG_LONG==8
typedef unsigned long long uint64_t;
#else
#if SIZEOF_UNSIGNED_LONG_LONG==8
typedef unsigned long long uint64_t;
+typedef long long int64_t;
#elif SIZEOF_UNSIGNED_LONG==8
typedef unsigned long uint64_t;
#elif SIZEOF_UNSIGNED_LONG==8
typedef unsigned long uint64_t;
+typedef long int64_t;
#else
#error I do not know what to use for a uint64_t.
#endif
#else
#error I do not know what to use for a uint64_t.
#endif
@@
-100,8
+126,10
@@
typedef unsigned long uint64_t;
/* Give us an unsigned 32-bit data type. */
#if SIZEOF_UNSIGNED_LONG==4
typedef unsigned long uint32_t;
/* Give us an unsigned 32-bit data type. */
#if SIZEOF_UNSIGNED_LONG==4
typedef unsigned long uint32_t;
+typedef long int32_t;
#elif SIZEOF_UNSIGNED_INT==4
typedef unsigned int uint32_t;
#elif SIZEOF_UNSIGNED_INT==4
typedef unsigned int uint32_t;
+typedef int int32_t;
#else
#error I do not know what to use for a uint32_t.
#endif
#else
#error I do not know what to use for a uint32_t.
#endif
@@
-109,8
+137,10
@@
typedef unsigned int uint32_t;
/* An unsigned 16-bit data type. */
#if SIZEOF_UNSIGNED_INT==2
typedef unsigned int uint16_t;
/* An unsigned 16-bit data type. */
#if SIZEOF_UNSIGNED_INT==2
typedef unsigned int uint16_t;
+typedef int int16_t;
#elif SIZEOF_UNSIGNED_SHORT==2
typedef unsigned short uint16_t;
#elif SIZEOF_UNSIGNED_SHORT==2
typedef unsigned short uint16_t;
+typedef short int16_t;
#else
#error I do not know what to use for a uint16_t.
#endif
#else
#error I do not know what to use for a uint16_t.
#endif
@@
-125,7
+155,17
@@
typedef unsigned char uint8_t;
#endif
#ifndef HAVE_SNPRINTF
#endif
#ifndef HAVE_SNPRINTF
+#include <stdio.h>
+#include <stdarg.h>
#include "snprintf.h"
#endif
#include "snprintf.h"
#endif
+#ifdef __GNUC__
+#define NORETURN(_x) void _x __attribute__ ((noreturn))
+#define FORMAT(_a,_b,_c) __attribute__ ((format (_a,_b,_c)))
+#else
+#define NORETURN(_x) _x
+#define FORMAT(_a,_b,_c)
+#endif
+
#endif /* _CONFIG_H */
#endif /* _CONFIG_H */