3 files changed, 12 insertions, 14 deletions
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index 6722fc69..d1246ea5 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -516,7 +516,7 @@ static inline void
 sockaddr_fill4(struct sockaddr_in *sa, ip_addr a, uint port)
 {
   memset(sa, 0, sizeof(struct sockaddr_in));
-#ifdef HAVE_SIN_LEN
+#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
   sa->sin_len = sizeof(struct sockaddr_in);
 #endif
   sa->sin_family = AF_INET;
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;
diff --git a/sysdep/unix/timer.h b/sysdep/unix/timer.h
index 99d43932..ae5a27e8 100644
--- a/sysdep/unix/timer.h
+++ b/sysdep/unix/timer.h
@@ -77,14 +77,12 @@ bird_clock_t tm_parse_datetime(char *);	/* Convert date to bird_clock_t */
 void
 tm_format_datetime(char *x, struct timeformat *fmt_spec, bird_clock_t t);
 
-#ifdef TIME_T_IS_64BIT
-#define TIME_INFINITY 0x7fffffffffffffff
-#else
-#ifdef TIME_T_IS_SIGNED
-#define TIME_INFINITY 0x7fffffff
-#else
-#define TIME_INFINITY 0xffffffff
-#endif
-#endif
+#define TIME_T_IS_64BIT (sizeof(time_t) == 8)
+#define TIME_T_IS_SIGNED ((time_t) -1 < 0)
+
+#define TIME_INFINITY							\
+  ((time_t) (TIME_T_IS_SIGNED ?						\
+	     (TIME_T_IS_64BIT ? 0x7fffffffffffffff : 0x7fffffff):	\
+	     (TIME_T_IS_64BIT ? 0xffffffffffffffff : 0xffffffff)))
 
 #endif