| 1 |
Support glibc 2.1. |
| 2 |
|
| 3 |
Bug-Debian: http://bugs.debian.org/1066605 |
| 4 |
Bug-Debian: http://bugs.debian.org/286428 |
| 5 |
Bug-Debian: http://bugs.debian.org/38362 |
| 6 |
|
| 7 |
--- a/ifcico/recvbark.c |
| 8 |
+++ b/ifcico/recvbark.c |
| 9 |
@@ -1,4 +1,5 @@ |
| 10 |
#include <stdio.h> |
| 11 |
+#include <string.h> |
| 12 |
#include "lutil.h" |
| 13 |
#include "ttyio.h" |
| 14 |
#include "session.h" |
| 15 |
--- a/ifcico/lastmtime.c |
| 16 |
+++ b/ifcico/lastmtime.c |
| 17 |
@@ -1,6 +1,7 @@ |
| 18 |
#include <stdio.h> |
| 19 |
#include <sys/types.h> |
| 20 |
#include <sys/stat.h> |
| 21 |
+#include <time.h> |
| 22 |
|
| 23 |
int main(argc,argv) |
| 24 |
int argc; |
| 25 |
--- a/iflib/lutil.h |
| 26 |
+++ b/iflib/lutil.h |
| 27 |
@@ -32,6 +32,8 @@ char *printablec(char); |
| 28 |
extern int getopt(); |
| 29 |
extern char *optarg; |
| 30 |
extern int optind; |
| 31 |
+#else |
| 32 |
+#include <getopt.h> |
| 33 |
#endif |
| 34 |
|
| 35 |
#if defined(HAS_TCP) || defined(HAS_TERM) |
| 36 |
--- a/iflib/parsedate.y |
| 37 |
+++ b/iflib/parsedate.y |
| 38 |
@@ -23,6 +23,8 @@ |
| 39 |
/* SUPPRESS 595 on yypvt *//* Automatic variable may be used before set */ |
| 40 |
#include "configdata.h" |
| 41 |
#include <stdio.h> |
| 42 |
+#include <stdlib.h> |
| 43 |
+#include <string.h> |
| 44 |
#include <ctype.h> |
| 45 |
#include <sys/types.h> |
| 46 |
#if defined(DO_NEED_TIME) |
| 47 |
@@ -101,6 +103,8 @@ static time_t yyRelSeconds; |
| 48 |
extern struct tm *localtime(); |
| 49 |
|
| 50 |
static void date_error(); |
| 51 |
+ |
| 52 |
+int date_lex(void); |
| 53 |
%} |
| 54 |
|
| 55 |
%union { |
| 56 |
@@ -665,7 +669,7 @@ LookupWord(buff, length) |
| 57 |
} |
| 58 |
|
| 59 |
|
| 60 |
-static int |
| 61 |
+int |
| 62 |
date_lex() |
| 63 |
{ |
| 64 |
register char c; |
| 65 |
--- a/iflib/gettime.c |
| 66 |
+++ b/iflib/gettime.c |
| 67 |
@@ -8,7 +8,6 @@ |
| 68 |
#include <time.h> |
| 69 |
#endif /* defined(DO_NEED_TIME) */ |
| 70 |
#include <sys/time.h> |
| 71 |
-#include "clibrary.h" |
| 72 |
#include "libinn.h" |
| 73 |
|
| 74 |
int |
| 75 |
--- a/iflib/mime.c |
| 76 |
+++ b/iflib/mime.c |
| 77 |
@@ -2,6 +2,7 @@ |
| 78 |
#include <ctype.h> |
| 79 |
#include <sys/types.h> |
| 80 |
#include <stdio.h> |
| 81 |
+#include <string.h> |
| 82 |
#include "needed.h" |
| 83 |
#include "lutil.h" |
| 84 |
#include "xutil.h" |
| 85 |
--- a/iflib/getopt.h |
| 86 |
+++ b/iflib/getopt.h |
| 87 |
@@ -4,4 +4,6 @@ extern int getopt(); |
| 88 |
extern char *optarg; |
| 89 |
extern int optind; |
| 90 |
|
| 91 |
+#else |
| 92 |
+#include <getopt.h> |
| 93 |
#endif |
| 94 |
--- a/ifgate/lastmtime.c |
| 95 |
+++ b/ifgate/lastmtime.c |
| 96 |
@@ -1,6 +1,7 @@ |
| 97 |
#include <stdio.h> |
| 98 |
#include <sys/types.h> |
| 99 |
#include <sys/stat.h> |
| 100 |
+#include <time.h> |
| 101 |
|
| 102 |
int main(argc,argv) |
| 103 |
int argc; |
| 104 |
--- a/ifgate/nlindex.h |
| 105 |
+++ b/ifgate/nlindex.h |
| 106 |
@@ -34,7 +34,7 @@ extern struct _pkey { |
| 107 |
unsigned char pflag; |
| 108 |
} pkey[]; |
| 109 |
|
| 110 |
-extern struct _fkey fkey[]; |
| 111 |
+extern struct _fkey *fkey; |
| 112 |
|
| 113 |
extern int initnl(void); |
| 114 |
|
| 115 |
--- a/ifcico/session.c |
| 116 |
+++ b/ifcico/session.c |
| 117 |
@@ -51,7 +51,7 @@ char *dt; |
| 118 |
fa_list *tmpl; |
| 119 |
#ifdef HAS_TCP |
| 120 |
struct sockaddr_in peeraddr; |
| 121 |
- int addrlen=sizeof(struct sockaddr_in); |
| 122 |
+ socklen_t addrlen=sizeof(struct sockaddr_in); |
| 123 |
#endif |
| 124 |
|
| 125 |
session_flags=0; |
| 126 |
--- a/iflib/config.h |
| 127 |
+++ b/iflib/config.h |
| 128 |
@@ -17,6 +17,8 @@ |
| 129 |
#define _(String) (String) |
| 130 |
#endif |
| 131 |
|
| 132 |
+#include <time.h> |
| 133 |
+ |
| 134 |
#include "ftn.h" |
| 135 |
|
| 136 |
#ifndef AREA_LIST_TYPE |
| 137 |
@@ -77,7 +79,7 @@ extern area_list *gatebaugroups; |
| 138 |
#endif |
| 139 |
|
| 140 |
extern long configverbose; |
| 141 |
-extern long configtime; |
| 142 |
+extern time_t configtime; |
| 143 |
extern long maxfsize; |
| 144 |
extern long maxpsize; |
| 145 |
extern long maxmsize; |
| 146 |
--- a/ifcico/zmmisc.c |
| 147 |
+++ b/ifcico/zmmisc.c |
| 148 |
@@ -92,8 +92,8 @@ char *Altcan; /* Alternate canit string |
| 149 |
char *txbuf=NULL; |
| 150 |
char *rxbuf=NULL; |
| 151 |
|
| 152 |
-static lastsent; /* Last char we sent */ |
| 153 |
-static Not8bit; /* Seven bits seen on header */ |
| 154 |
+static int lastsent; /* Last char we sent */ |
| 155 |
+static int Not8bit; /* Seven bits seen on header */ |
| 156 |
|
| 157 |
char *frametypes[] = { |
| 158 |
"EMPTY", /* -16 */ |