*** src/gated/task.h.orig	Sun May 14 14:58:18 2000
--- src/gated/task.h	Sun May 14 14:59:44 2000
***************
*** 321,327 ****
  extern size_t task_recv_buffer_len;
  
  
! #if defined(SUNOS5_0) || !defined(HAVE_CMSG_SPACE) 
  #ifndef CMSG_ALIGN
  #define CMSG_ALIGN(n)   (((n) + 3) & ~3)
  #define CMSG_SPACE(l)   (CMSG_ALIGN(sizeof(struct cmsghdr)) + CMSG_ALIGN(l))
--- 321,327 ----
  extern size_t task_recv_buffer_len;
  
  
! #if (defined(SUNOS5_0) || !defined(HAVE_CMSG_SPACE)) && !defined(__FreeBSD__) 
  #ifndef CMSG_ALIGN
  #define CMSG_ALIGN(n)   (((n) + 3) & ~3)
  #define CMSG_SPACE(l)   (CMSG_ALIGN(sizeof(struct cmsghdr)) + CMSG_ALIGN(l))
--- src/gated/str.c.orig	Sat Nov 24 14:43:52 2001
+++ src/gated/str.c	Sat Nov 24 14:43:52 2001
@@ -191,7 +191,7 @@
 
 #define	ARG() \
 	_ulong = flags&LONGINT ? va_arg(ap, long) : \
-	    flags&SHORTINT ? va_arg(ap, short) : va_arg(ap, int);
+	    flags&SHORTINT ? va_arg(ap, int) : va_arg(ap, int);
 
 #define	todigit(c)	((c) - '0')
 #define	tochar(n)	((n) + '0')
--- src/gated/str.h.orig	Sat Nov 24 14:57:05 2001
+++ src/gated/str.h	Sat Nov 24 14:57:18 2001
@@ -127,9 +127,11 @@
 char * gd_uplow(const char *, int);
 #define	gd_upper(str)	gd_uplow(str, TRUE)
 #define	gd_lower(str)	gd_uplow(str, FALSE)
+#if 0
 int fprintf(FILE *, const char *, ...);
 int vsprintf(char *, const char *, va_list );
 int sprintf(char *, const char *, ...);
+#endif
 #ifndef	HAVE_STRCASECMP
 int strcasecmp(const char *, const char *);
 int strncasecmp(const char *, const char *, size_t);
--- src/gatedcompat/include.h.orig	Sat Nov 24 15:03:57 2001
+++ src/gatedcompat/include.h	Sat Nov 24 15:02:38 2001
@@ -91,3 +91,4 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h> 
 #endif /* HAVE_UNISTD_H */
+#include <stdarg.h> 
--- src/gated/include.h.dist	2003-06-17 23:47:19.000000000 +0200
+++ src/gated/include.h	2003-06-17 23:47:37.000000000 +0200
@@ -89,11 +89,6 @@
 #define	_BSD	1
 #endif
 
-/* if we are using gcc, use the gcc va_list type */
-#if defined (__GNUC__) && !defined(hpux) && !defined(linux)
-#define _VA_LIST
-#endif /* __GNUC__ */
-
 #ifdef PROTO_INET6
 #include "krt_ipv6multi/krt_ipv6multi.h"
 #endif
Index: src/gated/lexer.l
--- src/gated/lexer.l.orig	2000-03-17 07:00:20 +0100
+++ src/gated/lexer.l	2005-02-06 16:07:23 +0100
@@ -178,8 +178,6 @@
 
 #define	YYTEXT	yytext
 
-int yylineno = 0;
-
 #undef	YY_INPUT
 #define	YY_INPUT(buf, result, max_size) \
 { \
@@ -207,6 +205,7 @@
 
 %}
 
+%option yylineno
 %s CONFIG PP
 %a 3300
 %o 5000