head 1.3; access; symbols OPENPKG_E1_MP_HEAD:1.3 OPENPKG_E1_MP:1.3 OPENPKG_E1_MP_2_STABLE:1.3.2.2 OPENPKG_E1_FP:1.3.2.2 OPENPKG_2_STABLE_MP:1.3 OPENPKG_2_STABLE_20061018:1.3.2.2 OPENPKG_2_STABLE:1.3.0.2 OPENPKG_CW_FP:1.3 OPENPKG_1_STABLE_MP:1.2; locks; strict; comment @# @; 1.3 date 2005.02.06.15.11.01; author rse; state Exp; branches 1.3.2.1; next 1.2; 1.2 date 2003.06.17.21.55.03; author mlelstv; state Exp; branches; next 1.1; 1.1 date 2002.05.29.19.56.11; author rse; state Exp; branches; next ; 1.3.2.1 date 2005.02.06.15.11.01; author rse; state dead; branches; next 1.3.2.2; commitid iZxwRSmmWscPXUQr; 1.3.2.2 date 2006.10.16.14.50.11; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; desc @@ 1.3 log @fix building under new Flex world order @ text @*** 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 #endif /* HAVE_UNISTD_H */ +#include --- 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 @ 1.3.2.1 log @file gated.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:50:11 +0000 @ text @d1 85 @ 1.3.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 85 *** 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 #endif /* HAVE_UNISTD_H */ +#include --- 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 @ 1.2 log @fix gcc build @ text @d66 20 @ 1.1 log @Finally rename all foo-X.Y.patch files to foo.patch in order to allow us to preserve history in CVS for patch files. @ text @d52 14 @