From:
[email protected]
Package: isdnutils
Severity: normal
Tags: patch
When building 'isdnutils' with gcc-3.4 I get the following error:
cc -Wall -O2 -c -o cdbmake.o cdbmake.c
cdbmake.c:6: error: conflicting types for 'malloc'
cdbmake.c:6: error: conflicting types for 'malloc'
make[2]: *** [cdbmake.o] Error 1
make[2]: Leaving directory `/isdnutils-3.3.0.20040728/isdnlog/tools/cdb'
With the attached patch 'isdnutils' can be compiled using gcc-3.4.
Regards
Andreas Jochens
diff -urN ../tmp-orig/isdnutils-3.3.0.20040704/eicon/divautil/linload.c ./eicon/divautil/linload.c
--- ../tmp-orig/isdnutils-3.3.0.20040704/eicon/divautil/linload.c 2000-12-02 22:39:42.000000000 +0100
+++ ./eicon/divautil/linload.c 2004-07-15 16:46:41.127177294 +0200
@@ -197,7 +197,6 @@
case 6:
filename[strlen(filename)-1]='6';
break;
- default:
}
}
diff -urN ../tmp-orig/isdnutils-3.3.0.20040704/isdnlog/isdnlog/processor.c ./isdnlog/isdnlog/processor.c
--- ../tmp-orig/isdnutils-3.3.0.20040704/isdnlog/isdnlog/processor.c 2003-10-29 18:41:34.000000000 +0100
+++ ./isdnlog/isdnlog/processor.c 2004-07-15 16:42:37.691874900 +0200
@@ -5564,7 +5564,7 @@
tei = BROADCAST; /* Wenn nach einer tei-Zeile keine hex:-Zeile kommt, tei ungueltig machen! */
if ((type == SETUP) && !replay) { /* fetch additional info from "/dev/isdninfo" */
- static void moreinfo(); /* soviel zu Objektorientiertem Denken ;-) */ +/* static void moreinfo(); /* soviel zu Objektorientiertem Denken ;-) */
moreinfo();
} /* if */
diff -urN ../tmp-orig/isdnutils-3.3.0.200407