Merge branch 'master' into int-new

4 files changed, 15 insertions, 107 deletions

diff --git a/sysdep/autoconf.h.in b/sysdep/autoconf.h.in
deleted file mode 100644
index fbaba2ce..00000000
--- a/sysdep/autoconf.h.in
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- *	This file contains all system parameters automatically
- *	discovered by the configure script.
- */
-
-/* System configuration file */
-#define SYSCONF_INCLUDE ?
-
-/* Include debugging code */
-#undef DEBUGGING
-
-/* 8-bit integer type */
-#define INTEGER_8 ?
-
-/* 16-bit integer type */
-#define INTEGER_16 ?
-
-/* 32-bit integer type */
-#define INTEGER_32 ?
-
-/* 64-bit integer type */
-#define INTEGER_64 ?
-
-/* CPU endianity */
-#undef CPU_LITTLE_ENDIAN
-#undef CPU_BIG_ENDIAN
-
-/* Usual alignment for structures */
-#define CPU_STRUCT_ALIGN 1
-
-/* Characteristics of time_t */
-#undef TIME_T_IS_64BIT
-#undef TIME_T_IS_SIGNED
-
-/* We have struct ip_mreqn in <netinet/in.h> */
-#undef HAVE_STRUCT_IP_MREQN
-
-/* Protocols compiled in */
-#undef CONFIG_STATIC
-#undef CONFIG_RIP
-#undef CONFIG_RADV
-#undef CONFIG_BFD
-#undef CONFIG_BGP
-#undef CONFIG_OSPF
-#undef CONFIG_PIPE
-#undef CONFIG_BABEL
-#undef CONFIG_RPKI
-
-/* We use multithreading */
-#undef USE_PTHREADS
-
-/* We have <syslog.h> and syslog() */
-#undef HAVE_SYSLOG
-
-/* We have <alloca.h> */
-#undef HAVE_ALLOCA_H
-
-/* Are we using dmalloc? */
-#undef HAVE_LIBDMALLOC
-
-/* Readline stuff */
-#undef HAVE_RL_CRLF
-#undef HAVE_RL_DING
-
-/* struct sockaddr_in(6) */
-#undef HAVE_SIN_LEN
-
-/* We have stdint.h */
-#undef HAVE_STDINT_H
-
-/* We have execinfo.h */
-#undef HAVE_EXECINFO_H
-
-/* We have LibSSH */
-#undef HAVE_LIBSSH
-
-/* We have linux lwtunnel */
-#undef HAVE_LWTUNNEL
-
-/* We have struct rtvia */
-#undef HAVE_STRUCT_RTVIA
-
-#define CONFIG_PATH ?
diff --git a/sysdep/config.h b/sysdep/config.h
index 2ec31500..d740ff06 100644
--- a/sysdep/config.h
+++ b/sysdep/config.h
@@ -24,16 +24,17 @@
 #include "sysdep/paths.h"
 
 /* Types */
-typedef signed INTEGER_8 s8;
-typedef unsigned INTEGER_8 u8;
-typedef INTEGER_16 s16;
-typedef unsigned INTEGER_16 u16;
-typedef INTEGER_32 s32;
-typedef unsigned INTEGER_32 u32;
-typedef INTEGER_64 s64;
-typedef unsigned INTEGER_64 u64;
-typedef u8 byte;
-typedef u16 word;
+#include <stdint.h>
+typedef int8_t s8;
+typedef uint8_t u8;
+typedef int16_t s16;
+typedef uint16_t u16;
+typedef int32_t s32;
+typedef uint32_t u32;
+typedef int64_t s64;
+typedef uint64_t u64;
+typedef uint8_t byte;
+typedef uint16_t word;
 typedef unsigned int uint;
 
 #endif
diff --git a/sysdep/linux/sysio.h b/sysdep/linux/sysio.h
index 58644417..b1cc25dc 100644
--- a/sysdep/linux/sysio.h
+++ b/sysdep/linux/sysio.h
@@ -7,16 +7,6 @@
  */
 
 
-#ifndef HAVE_STRUCT_IP_MREQN
-/* Several versions of glibc don't define this structure, so we have to do it ourselves */
-struct ip_mreqn
-{
-  struct in_addr imr_multiaddr;			/* IP multicast address of group */
-  struct in_addr imr_address;			/* local IP address of interface */
-  int		 imr_ifindex;			/* Interface index */
-};
-#endif
-
 #ifndef IP_MINTTL
 #define IP_MINTTL 21
 #endif
diff --git a/sysdep/unix/log.c b/sysdep/unix/log.c
index 42c933ef..06d3b09e 100644
--- a/sysdep/unix/log.c
+++ b/sysdep/unix/log.c
@@ -56,7 +56,7 @@ static int main_thread_self(void) { return 1; }
 #endif
 
 
-#ifdef HAVE_SYSLOG
+#ifdef HAVE_SYSLOG_H
 #include <sys/syslog.h>
 
 static int syslog_priorities[] = {
@@ -127,7 +127,7 @@ log_commit(int class, buffer *buf)
 	  fputc('\n', l->fh);
 	  fflush(l->fh);
 	}
-#ifdef HAVE_SYSLOG
+#ifdef HAVE_SYSLOG_H
       else
 	syslog(syslog_priorities[class], "%s", buf->start);
 #endif
@@ -262,7 +262,7 @@ default_log_list(int debug, int init, char **syslog_name)
   init_list(&init_log_list);
   *syslog_name = NULL;
 
-#ifdef HAVE_SYSLOG
+#ifdef HAVE_SYSLOG_H
   if (!debug)
     {
       static struct log_config lc_syslog = { .mask = ~0 };
@@ -287,7 +287,7 @@ log_switch(int debug, list *l, char *new_syslog_name)
 
   current_log_list = l;
 
-#ifdef HAVE_SYSLOG
+#ifdef HAVE_SYSLOG_H
   if (current_syslog_name && new_syslog_name &&
       !strcmp(current_syslog_name, new_syslog_name))
     return;