From: "Samuli Suominen (ssuominen)" <ssuominen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/pixie/files: pixie-2.2.6-zlib-1.2.5.2.patch
Date: Sat, 10 Mar 2012 09:19:21 +0000 (UTC) [thread overview]
Message-ID: <20120310091921.319852004C@flycatcher.gentoo.org> (raw)
ssuominen 12/03/10 09:19:21
Added: pixie-2.2.6-zlib-1.2.5.2.patch
Log:
Fix building with sys-libs/zlib >= 1.2.5.2 wrt #406899 by Helmut Jarausch
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Revision Changes Path
1.1 media-gfx/pixie/files/pixie-2.2.6-zlib-1.2.5.2.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/pixie/files/pixie-2.2.6-zlib-1.2.5.2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/pixie/files/pixie-2.2.6-zlib-1.2.5.2.patch?rev=1.1&content-type=text/plain
Index: pixie-2.2.6-zlib-1.2.5.2.patch
===================================================================
http://bugs.gentoo.org/406899
--- src/ri/rib.l
+++ src/ri/rib.l
@@ -17,7 +17,7 @@
// Overwrite the YYinput so that it uses libz
#undef YY_INPUT
-#define YY_INPUT(buf, retval, maxlen) if ( (retval = gzread(ribin,buf,maxlen)) < 0) \
+#define YY_INPUT(buf, retval, maxlen) if ( (retval = gzread((gzFile)ribin,buf,maxlen)) < 0) \
YY_FATAL_ERROR( "input in flex scanner failed" );
#endif
@@ -223,7 +223,7 @@
TRibFile *nextFile = ribStack->next;
rib_delete_buffer( YY_CURRENT_BUFFER );
#ifdef HAVE_ZLIB
- gzclose(ribin);
+ gzclose((gzFile)ribin);
#else
fclose(ribin);
#endif
@@ -243,7 +243,7 @@
rib_delete_buffer( YY_CURRENT_BUFFER );
#ifdef HAVE_ZLIB
- gzclose(ribin);
+ gzclose((gzFile)ribin);
#else
fclose(ribin);
#endif
--- src/ri/ribOut.cpp
+++ src/ri/ribOut.cpp
@@ -162,7 +162,7 @@
#ifdef HAVE_ZLIB
if (outputCompressed) {
- gzclose(outFile);
+ gzclose((gzFile)outFile);
} else {
fclose(outFile);
}
--- src/ri/ribOut.h
+++ src/ri/ribOut.h
@@ -237,7 +237,7 @@
const int l = vsprintf(scratch,mes,args);
#ifdef HAVE_ZLIB
- if (outputCompressed) gzwrite(outFile,scratch,l);
+ if (outputCompressed) gzwrite((gzFile)outFile,scratch,l);
else fwrite(scratch,1,l,outFile);
#else
fwrite(scratch,1,l,outFile);
@@ -258,7 +258,7 @@
const int l = vsprintf(scratch,mes,args);
#ifdef HAVE_ZLIB
- if (outputCompressed) gzwrite(outFile,scratch,l);
+ if (outputCompressed) gzwrite((gzFile)outFile,scratch,l);
else fwrite(scratch,1,l,outFile);
#else
fwrite(scratch,1,l,outFile);
--- src/ri/rib.y
+++ src/ri/rib.y
@@ -2940,7 +2940,7 @@
if (ribin != NULL) {
#ifdef HAVE_ZLIB
- gzclose(ribin);
+ gzclose((gzFile)ribin);
#else
fclose(ribin);
#endif
reply other threads:[~2012-03-10 9:19 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120310091921.319852004C@flycatcher.gentoo.org \
--to=ssuominen@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox