RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 28-Jun-2016 09:18:12 Branch: rpm-5_4 Handle: 2016062807181200 Modified files: (Branch: rpm-5_4) rpm/rpmio rpmio.c rpmio.h Log: - mingw: fix: portability. Summary: Revision Changes Path 1.230.2.33 +5 -5 rpm/rpmio/rpmio.c 1.97.2.9 +0 -1 rpm/rpmio/rpmio.h ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/rpmio/rpmio.c ============================================================================ $ cvs diff -u -r1.230.2.32 -r1.230.2.33 rpmio.c --- rpm/rpmio/rpmio.c 27 Jun 2016 03:05:58 -0000 1.230.2.32 +++ rpm/rpmio/rpmio.c 28 Jun 2016 07:18:12 -0000 1.230.2.33 @@ -2821,7 +2821,7 @@ FILE * fp = NULL; #if _USE_LIBIO -#if defined(HAVE_FOPENCOOKIE) +#if defined(HAVE_FOPENCOOKIE) && defined(linux) { cookie_io_functions_t ciof; ciof.read = iof->read; ciof.write = iof->write; @@ -2832,10 +2832,10 @@ } #elif defined(HAVE_FUNOPEN) { void * cookie = (void *) fd; - int (*readfn) (void *cookie, char *, int) = - (int (*) (void *, char *, int)) iof->read; - int (*writefn) (void *cookie, const char *, int) = - (int (*) (void *, const char *, int)) iof->write; + int (*readfn) (void *cookie, char *, size_t) = + (int (*) (void *, char *, size_t)) iof->read; + int (*writefn) (void *cookie, const char *, size_t) = + (int (*) (void *, const char *, size_t)) iof->write; fpos_t (*seekfn) (void *cookie, fpos_t, int) = (fpos_t (*) (void *, fpos_t, int)) iof->seek; int (*closefn) (void *cookie) = @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmio.h ============================================================================ $ cvs diff -u -r1.97.2.8 -r1.97.2.9 rpmio.h --- rpm/rpmio/rpmio.h 27 Jun 2016 03:05:58 -0000 1.97.2.8 +++ rpm/rpmio/rpmio.h 28 Jun 2016 07:18:12 -0000 1.97.2.9 @@ -9,7 +9,6 @@ #include <sys/types.h> #include <features.h> #include <stdio.h> -#include <libio.h> #include <rpmiotypes.h> #include <rpmdefs.h> @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org