Package: thy Version: 0.9.4-1 Severity: serious Tags: patch thy fails to build because it contains a declaration of gz_header that conflicts with the declaration in /usr/include/zlib.h:
> cc -c -I. -I../../../src -I.. -DPATCHLEVEL=\"4\" -DEXTRAVERSION=\"" Debian > (i386)"\" -D_GNU_SOURCE=1 -DSYSCONFDIR=\"/etc\" -DLIBDIR=\"/usr/lib\" > -Winline -Wshadow -Wpointer-arith -Wmissing-declarations -Wstrict-prototypes > -Wmissing-prototypes -Wcast-qual -Wbad-function-cast -Wchar-subscripts > -Wcomment -Wformat -Wformat-nonliteral -Wformat-security -Wimplicit > -Wmissing-braces -Wparentheses -Wswitch -Wunused -g -O2 > -D_FILE_OFFSET_BITS=64 -I../../../lib ../../../src/gzip.c -o gzip.o > ../../../src/gzip.c:57: error: 'gz_header' redeclared as different kind of > symbol > /usr/include/zlib.h:124: error: previous declaration of 'gz_header' was here > ../../../src/gzip.c: In function 'thy_zlib_send': > ../../../src/gzip.c:115: warning: pointer targets in passing argument 1 of > 'compress2' differ in signedness -- Matt
only in patch2:
unchanged:
--- thy-0.9.4.orig/src/gzip.c
+++ thy-0.9.4/src/gzip.c
@@ -54,7 +54,7 @@
* We are going the easy way: no filename, no timestamp, no
* nothing. Just a plain dumb gzip header.
*/
-static char gz_header[] = {0x1f, 0x8b, Z_DEFLATED, 0, 0, 0, 0, 0, 0, 0x03};
+static char static_gz_header[] = {0x1f, 0x8b, Z_DEFLATED, 0, 0, 0, 0, 0, 0,
0x03};
/** @internal Opaque type for compressed session data.
*/
@@ -118,9 +118,9 @@
/* Construct gzip header */
free (session->body.header.buff);
session->body.header.buff =
- (char *)bhc_malloc (sizeof (gz_header) + 1);
- memcpy (session->body.header.buff, gz_header, sizeof (gz_header));
- session->body.header.size = sizeof (gz_header);
+ (char *)bhc_malloc (sizeof (static_gz_header) + 1);
+ memcpy (session->body.header.buff, static_gz_header, sizeof
(static_gz_header));
+ session->body.header.size = sizeof (static_gz_header);
session->body.header.offset = 0;
/* Construct gzip footer */
signature.asc
Description: Digital signature
