sinjuginas/rpm-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace all uses of _IO_off64_t with off64_t

Browse Source 
Mechanically substitute _IO_off64_t with off64_t using
$ git grep -Fwl _IO_off64_t |xargs -r sed -i s/_IO_off64_t/off64_t/g

This follows glibc-2.28~574 and fixes build with glibc >= 2.28.
This commit is contained in:
Дмитрий Левин 2019-11-24 11:58:18 +00:00
parent 9977eae223
commit fdd98a7997
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rpmio/rpmio.c
View File

@ -434,7 +434,7 @@ static inline int fdSeek(void * cookie, _libio_pos_t pos, int whence)
/*@modifies fileSystem, internalState @*/
{
#ifdef USE_COOKIE_SEEK_POINTER
_IO_off64_t p = *pos;
off64_t p = *pos;
#else
off_t p = pos;
#endif
@ -2460,7 +2460,7 @@ static inline int gzdSeek(void * cookie, _libio_pos_t pos, int whence)
/*@modifies fileSystem, internalState @*/
{
#ifdef USE_COOKIE_SEEK_POINTER
_IO_off64_t p = *pos;
off64_t p = *pos;
#else
off_t p = pos;
#endif
@ -3280,7 +3280,7 @@ DBGIO(fd, (stderr, "==> Fwrite(%p,%u,%u,%p) %s\n", buf, (unsigned)size, (unsigne
int Fseek(FD_t fd, _libio_off_t offset, int whence) {
fdio_seek_function_t _seek;
#ifdef USE_COOKIE_SEEK_POINTER
_IO_off64_t o64 = offset;
off64_t o64 = offset;
_libio_pos_t pos = &o64;
#else
_libio_pos_t pos = offset;

2
rpmio/rpmio.h
View File

@ -30,7 +30,7 @@ typedef /*@abstract@*/ struct pgpDig_s * pgpDig;
#if !defined(__LCLINT__) && defined(__GLIBC__) && \
(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2))
#define USE_COOKIE_SEEK_POINTER 1
typedef _IO_off64_t _libio_off_t;
typedef off64_t _libio_off_t;
typedef _libio_off_t * _libio_pos_t;
#else
typedef off_t _libio_off_t;