projects / packages / rpm.git / blame
| Commit | Line | Data |
|---|---|---|
| c0a8bb95 AM |
1 | diff -upr rpm-5.4.15.org/rpmio/gzdio.c rpm-5.4.15/rpmio/gzdio.c |
| 2 | --- rpm-5.4.15.org/rpmio/gzdio.c 2012-04-16 05:21:22.000000000 +0200 | |
| 3 | +++ rpm-5.4.15/rpmio/gzdio.c 2018-08-11 12:36:48.761296851 +0200 | |
| 4 | @@ -380,7 +380,7 @@ static int gzdSeek(void * cookie, _libio | |
| 5 | int rc; | |
| 6 | #if defined(HAVE_GZSEEK) | |
| 7 | #ifdef USE_COOKIE_SEEK_POINTER | |
| 8 | - _IO_off64_t p = *pos; | |
| 9 | + off64_t p = *pos; | |
| 10 | #else | |
| 11 | off_t p = pos; | |
| 12 | #endif | |
| 13 | diff -upr rpm-5.4.15.org/rpmio/rpmio.c rpm-5.4.15/rpmio/rpmio.c | |
| 14 | --- rpm-5.4.15.org/rpmio/rpmio.c 2014-08-05 00:47:16.000000000 +0200 | |
| 15 | +++ rpm-5.4.15/rpmio/rpmio.c 2018-08-11 12:36:48.757963417 +0200 | |
| 16 | @@ -481,7 +481,7 @@ static int fdSeek(void * cookie, _libio_ | |
| 17 | /*@modifies fileSystem, internalState @*/ | |
| 18 | { | |
| 19 | #ifdef USE_COOKIE_SEEK_POINTER | |
| 20 | - _IO_off64_t p = *pos; | |
| 21 | + off64_t p = *pos; | |
| 22 | #else | |
| 23 | off_t p = pos; | |
| 24 | #endif | |
| 25 | @@ -2458,7 +2458,7 @@ int Fseek(FD_t fd, _libio_off_t offset, | |
| 26 | { | |
| 27 | fdio_seek_function_t _seek; | |
| 28 | #ifdef USE_COOKIE_SEEK_POINTER | |
| 29 | - _IO_off64_t o64 = offset; | |
| 30 | + off64_t o64 = offset; | |
| 31 | _libio_pos_t pos = &o64; | |
| 32 | #else | |
| 33 | _libio_pos_t pos = offset; | |
| 34 | diff -upr rpm-5.4.15.org/rpmio/rpmio.h rpm-5.4.15/rpmio/rpmio.h | |
| 35 | --- rpm-5.4.15.org/rpmio/rpmio.h 2014-07-20 01:01:26.000000000 +0200 | |
| 36 | +++ rpm-5.4.15/rpmio/rpmio.h 2018-08-11 12:36:48.761296851 +0200 | |
| f0190526 AM |
37 | @@ -1,6 +1,10 @@ |
| 38 | #ifndef H_RPMIO | |
| 39 | #define H_RPMIO | |
| 40 | ||
| 41 | +#ifndef _GNU_SOURCE | |
| 42 | +#define _GNU_SOURCE 1 | |
| 43 | +#endif | |
| 44 | + | |
| 45 | /** \ingroup rpmio | |
| 46 | * \file rpmio/rpmio.h | |
| 47 | * | |
| c0a8bb95 AM |
48 | @@ -25,7 +25,7 @@ |
| 49 | #if !defined(__LCLINT__) && !defined(__UCLIBC__) && 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; | |
| 55 | #else | |
| 56 | typedef off_t _libio_off_t; |