[mICQ] macro "dc_strerror": CVS broken?

[Frank Gruellich]

Hi,

with current CVS I get this error:

Making all in src
make[1]: Entering directory `/home/admin/frank/data/hacking/micq/src'
if gcc -DHAVE_CONFIG_H -I. -I. -I../include    -DPKGDATADIR='"/usr/local/share/micq"' -I../include -g -O2 -Wall -MT util_io.o -MD -MP -MF ".deps/util_io.Tpo" -c -o util_io.o util_io.c; \
then mv -f ".deps/util_io.Tpo" ".deps/util_io.Po"; else rm -f ".deps/util_io.Tpo"; exit 1; fi
util_io.c:773:120: macro "dc_strerror" passed 3 arguments, but takes just 2
util_io.c: In function `UtilIOReceiveTCP':
util_io.c:773: error: `dc_strerror' undeclared (first use in this function)
util_io.c:773: error: (Each undeclared identifier is reported only once
util_io.c:773: error: for each function it appears in.)
util_io.c:915:120: macro "dc_strerror" passed 3 arguments, but takes just 2
util_io.c: In function `UtilIOSendTCP':
util_io.c:915: error: `dc_strerror' undeclared (first use in this function)
make[1]: *** [util_io.o] Error 1
make[1]: Leaving directory `/home/admin/frank/data/hacking/micq/src'
make: *** [all-recursive] Error 1

dc_strerror is declared in include/util_ssl.h as

#define dc_strerror(c,e) strerror(e)

(at least for undefined ENABLE_SSL) and called in src/util_io.c with

dc_strerror (conn, ssl_rc, rc)

two times.  This

Index: include/util_ssl.h
===================================================================
RCS file: /var/lib/cvs/micq/include/util_ssl.h,v
retrieving revision 1.6
diff -u -r1.6 util_ssl.h
--- include/util_ssl.h  3 Dec 2006 22:24:37 -0000       1.6
+++ include/util_ssl.h  6 Feb 2007 12:10:10 -0000
@@ -46,6 +46,6 @@
 #define dc_write(c,d,l)  sockwrite((c)->sok,d,l)
 #define dc_read(c,d,l)   sockread((c)->sok,d,l)
 #define dc_close(c)      sockclose((c)->sok)
-#define dc_strerror(c,e) strerror(e)
+#define dc_strerror(c,e,r) strerror(e)
 #endif

"fixes" the problem, but I don't know if it breaks anything.

 Gruss vom Frank.
-- 
Sigmentation fault