From fdd98a79978297ba5288400382cd0b2ac5ff7592 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Sun, 24 Nov 2019 11:58:18 +0000 Subject: [PATCH] Replace all uses of _IO_off64_t with off64_t 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. --- rpmio/rpmio.c | 6 +++--- rpmio/rpmio.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c index 3ffaf1e..8a66dba 100644 --- a/rpmio/rpmio.c +++ b/rpmio/rpmio.c @@ -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; diff --git a/rpmio/rpmio.h b/rpmio/rpmio.h index b149bcf..84fa736 100644 --- a/rpmio/rpmio.h +++ b/rpmio/rpmio.h @@ -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;