RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 04-Jul-2017 05:11:29 Branch: rpm-5_4 Handle: 2017070403112900 Modified files: (Branch: rpm-5_4) rpm/rpmio rpmaio.c Log: - rpmaio: permit building --without-aio. Summary: Revision Changes Path 1.1.2.4 +38 -3 rpm/rpmio/rpmaio.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/rpmio/rpmaio.c ============================================================================ $ cvs diff -u -r1.1.2.3 -r1.1.2.4 rpmaio.c --- rpm/rpmio/rpmaio.c 29 May 2017 16:21:00 -0000 1.1.2.3 +++ rpm/rpmio/rpmaio.c 4 Jul 2017 03:11:29 -0000 1.1.2.4 @@ -5,14 +5,49 @@ #include "system.h" +#include <rpmio.h> +#include <yarn.h> + #if defined(WITH_AIO) #if defined(HAVE_AIO_H) # include <aio.h> #endif -#endif /* WITH_AIO */ -#include <rpmio.h> -#include <yarn.h> +#else /* WITH_AIO */ + +/* XXX stub in enough to use struct aiocb_s pool */ +enum { + LIO_READ, + LIO_WRITE, + LIO_NOP, +}; + +struct aiocb +{ + int aio_fildes; /* File desriptor. */ + int aio_lio_opcode; /* Operation to be performed. */ + int aio_reqprio; /* Request priority offset. */ + volatile void *aio_buf; /* Location of buffer. */ + size_t aio_nbytes; /* Length of transfer. */ + struct sigevent aio_sigevent; /* Signal number and value. */ + + /* Internal members. */ + struct aiocb *__next_prio; + int __abs_prio; + int __policy; + int __error_code; + __ssize_t __return_value; + +#ifndef __USE_FILE_OFFSET64 + __off_t aio_offset; /* File offset. */ + char __pad[sizeof (__off64_t) - sizeof (__off_t)]; +#else + __off64_t aio_offset; /* File offset. */ +#endif + char __glibc_reserved[32]; +}; + +#endif /* WITH_AIO */ #define _RPMAIO_INTERNAL #include "rpmaio.h" @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org