RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 04-Jan-2010 22:36:39
Branch: HEAD Handle: 2010010421363801
Modified files:
rpm/rpmio gzdio.c rpmio.c xzdio.c
Log:
remove inline from *Seek, to avoid linking errors
Summary:
Revision Changes Path
2.17 +1 -1 rpm/rpmio/gzdio.c
1.212 +2 -2 rpm/rpmio/rpmio.c
1.14 +1 -1 rpm/rpmio/xzdio.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmio/gzdio.c
============================================================================
$ cvs diff -u -r2.16 -r2.17 gzdio.c
--- rpm/rpmio/gzdio.c 28 Aug 2009 14:09:02 -0000 2.16
+++ rpm/rpmio/gzdio.c 4 Jan 2010 21:36:38 -0000 2.17
@@ -368,7 +368,7 @@
/* XXX zlib-1.0.4 has not */
#define HAVE_GZSEEK /* XXX autoFu doesn't set this anymore. */
-static inline int gzdSeek(void * cookie, _libio_pos_t pos, int whence)
+static int gzdSeek(void * cookie, _libio_pos_t pos, int whence)
/*...@globals fileSystem, internalState @*/
/*...@modifies fileSystem, internalState @*/
{
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmio.c
============================================================================
$ cvs diff -u -r1.211 -r1.212 rpmio.c
--- rpm/rpmio/rpmio.c 24 Dec 2009 16:23:50 -0000 1.211
+++ rpm/rpmio/rpmio.c 4 Jan 2010 21:36:38 -0000 1.212
@@ -464,7 +464,7 @@
return rc;
}
-static inline int fdSeek(void * cookie, _libio_pos_t pos, int whence)
+static int fdSeek(void * cookie, _libio_pos_t pos, int whence)
/*...@globals fileSystem, internalState @*/
/*...@modifies fileSystem, internalState @*/
{
@@ -2049,7 +2049,7 @@
return (ssize_t) count;
}
-static inline int ufdSeek(void * cookie, _libio_pos_t pos, int whence)
+static int ufdSeek(void * cookie, _libio_pos_t pos, int whence)
/*...@globals fileSystem, internalState @*/
/*...@modifies fileSystem, internalState @*/
{
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/xzdio.c
============================================================================
$ cvs diff -u -r1.13 -r1.14 xzdio.c
--- rpm/rpmio/xzdio.c 28 Aug 2009 14:09:02 -0000 1.13
+++ rpm/rpmio/xzdio.c 4 Jan 2010 21:36:39 -0000 1.14
@@ -425,7 +425,7 @@
return rc;
}
-static inline int xzdSeek(void * cookie, /*...@unused@*/ _libio_pos_t pos,
+static int xzdSeek(void * cookie, /*...@unused@*/ _libio_pos_t pos,
/*...@unused@*/ int whence)
/*...@*/
{
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
