Package: isdnutils
Severity: normal
Tags: patch
When building 'isdnutils' on amd64 with gcc-4.0,
I get the following error:
gcc -o bin/isdnconf isdnconf/isdnconf.o tools/tools.o tools/isdnconf.o
tools/rate.o tools/zone.o tools/holiday.o tools/telnum.o tools/dest.o
tools/zone/upack.o ../lib/libisdn.a tools/cdb/i4l_cdb.a -lm
Compiling tools/isdnrate.c
tools/isdnrate.c:330: error: static declaration of 'myname' follows non-static
declaration
./isdnlog/isdnlog.h:505: error: previous declaration of 'myname' was here
tools/isdnrate.c:330: error: static declaration of 'myshortname' follows
non-static declaration
./isdnlog/isdnlog.h:505: error: previous declaration of 'myshortname' was here
tools/isdnrate.c:339: error: static declaration of 'day' follows non-static
declaration
./tools/tools.h:1153: error: previous declaration of 'day' was here
tools/isdnrate.c:339: error: static declaration of 'month' follows non-static
declaration
./tools/tools.h:1154: error: previous declaration of 'month' was here
tools/isdnrate.c:339: error: static declaration of 'hour' follows non-static
declaration
./tools/tools.h:1152: error: previous declaration of 'hour' was here
make[2]: *** [tools/isdnrate.o] Error 1
make[2]: Leaving directory `/isdnutils-3.6.2005-01-03/isdnlog'
With the attached patch 'isdnutils' can be compiled
on amd64 using gcc-4.0.
Regards
Andreas Jochens
diff -urN ../tmp-orig/isdnutils-3.6.2005-01-03/isdnlog/tools/isdnrate.c
./isdnlog/tools/isdnrate.c
--- ../tmp-orig/isdnutils-3.6.2005-01-03/isdnlog/tools/isdnrate.c
2004-12-18 16:10:50.000000000 +0100
+++ ./isdnlog/tools/isdnrate.c 2005-03-03 22:20:56.443407426 +0100
@@ -327,7 +327,7 @@
static void print_header(void);
-static char *myname, *myshortname;
+char *myname,*myshortname;
static char options[] = "ab:c:d:f:h:i:l:op:r:st:v::x:CD::G:HLNP:O:S:TUVX::Z";
static char usage[] = "%s: usage: %s [ -%s ] Destination ...\n";
@@ -336,7 +336,7 @@
static int usestat = 0;
static int duration = LCR_DURATION;
static time_t start;
-static int day, month, year, hour, min, sec;
+static int year, min, sec;
static char ignore[MAXPROVIDER];
static char *fromarea = 0;
static char wanted_day;
diff -urN ../tmp-orig/isdnutils-3.6.2005-01-03/eicon/eiconctrl.c
./eicon/eiconctrl.c
--- ../tmp-orig/isdnutils-3.6.2005-01-03/eicon/eiconctrl.c 2001-03-01
15:59:12.000000000 +0100
+++ ./eicon/eiconctrl.c 2005-03-03 22:20:10.278318140 +0100
@@ -1970,7 +1970,7 @@
val = strtol(p, &q, 16);
p = q;
val = strtol(p, &q, 16);
- (unsigned short) *buffer = (unsigned short) val;
+ *buffer = (unsigned short) val;
pos = 2;
while ((p != q) && (*q != 0)) {
p = q;
Binary files ../tmp-orig/isdnutils-3.6.2005-01-03/hisax/ISAR.BIN and
./hisax/ISAR.BIN differ
diff -urN ../tmp-orig/isdnutils-3.6.2005-01-03/hisax/hisaxctrl.c
./hisax/hisaxctrl.c
--- ../tmp-orig/isdnutils-3.6.2005-01-03/hisax/hisaxctrl.c 2000-06-29
19:38:26.000000000 +0200
+++ ./hisax/hisaxctrl.c 2005-03-03 22:18:37.907147481 +0100
@@ -43,7 +43,7 @@
fprintf(stderr, "cannot open file %s\n", fname);
exit(-1);
}
- p = (int *) buffer = (unsigned char *) malloc(MAX_SIZE+4);
+ p = buffer = (unsigned char *) malloc(MAX_SIZE+4);
if (!buffer) {
fprintf(stderr, "cannot get %d byte memory\n", MAX_SIZE+4);
exit(-1);
diff -urN ../tmp-orig/isdnutils-3.6.2005-01-03/ipppd/main.c ./ipppd/main.c
--- ../tmp-orig/isdnutils-3.6.2005-01-03/ipppd/main.c 2003-07-01
00:30:57.000000000 +0200
+++ ./ipppd/main.c 2005-03-03 22:21:23.684149461 +0100
@@ -1044,10 +1044,10 @@
static char line[256]; /* line to be logged accumulated here */
static char *linep;
+static void pr_log __P((void *, char *, ...));
+
void log_packet(u_char *p,int len,char *prefix,int linkunit)
{
- static void pr_log __P((void *, char *, ...));
-
int i, n;
u_short proto;
u_char x;
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
