1 diff -urp rpm-4.5.orig/rpmio/rpmio.c rpm-4.5/rpmio/rpmio.c
2 --- rpm-4.5.orig/rpmio/rpmio.c 2018-10-23 10:42:28.780416609 +0000
3 +++ rpm-4.5/rpmio/rpmio.c 2018-10-23 10:46:39.497416609 +0000
4 @@ -422,7 +422,7 @@ static inline int fdSeek(void * cookie,
5 /*@modifies fileSystem, internalState @*/
7 #ifdef USE_COOKIE_SEEK_POINTER
8 - _IO_off64_t p = *pos;
13 @@ -2432,7 +2432,7 @@ static inline int gzdSeek(void * cookie,
14 /*@modifies fileSystem, internalState @*/
16 #ifdef USE_COOKIE_SEEK_POINTER
17 - _IO_off64_t p = *pos;
22 @@ -2804,7 +2804,7 @@ DBGIO(fd, (stderr, "==> Fwrite(%p,%u,%u,
23 int Fseek(FD_t fd, _libio_off_t offset, int whence) {
24 fdio_seek_function_t _seek;
25 #ifdef USE_COOKIE_SEEK_POINTER
26 - _IO_off64_t o64 = offset;
27 + off64_t o64 = offset;
28 _libio_pos_t pos = &o64;
30 _libio_pos_t pos = offset;
31 @@ -2989,13 +2989,6 @@ static inline void cvtfmode (const char
36 -#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ == 0
37 -/* XXX retrofit glibc-2.1.x typedef on glibc-2.0.x systems */
38 -typedef _IO_cookie_io_functions_t cookie_io_functions_t;
43 FD_t Fdopen(FD_t ofd, const char *fmode)
45 diff -urp rpm-4.5.orig/rpmio/rpmio.h rpm-4.5/rpmio/rpmio.h
46 --- rpm-4.5.orig/rpmio/rpmio.h 2018-10-23 10:42:28.788416609 +0000
47 +++ rpm-4.5/rpmio/rpmio.h 2018-10-23 10:43:19.413416609 +0000
48 @@ -34,7 +34,7 @@ typedef /*@abstract@*/ struct pgpDigPara
49 #if !defined(__LCLINT__) && defined(__GLIBC__) && \
50 (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2))
51 #define USE_COOKIE_SEEK_POINTER 1
52 -typedef _IO_off64_t _libio_off_t;
53 +typedef off64_t _libio_off_t;
54 typedef _libio_off_t * _libio_pos_t;
56 typedef off_t _libio_off_t;