mirror of
				https://gitlab.labs.nic.cz/labs/bird.git
				synced 2024-05-11 16:54:54 +00:00 
			
		
		
		
	Some more autoconf cleanups
Replace integer type width detection with C99 fixed-width types. Also remove some unused or obsolete code. Thanks to Ruben Kerkhof for the patchset.
This commit is contained in:
		@@ -24,16 +24,18 @@
 | 
			
		||||
#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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user