Merge branch 'szaydel/solaris-Wincompatible-pointer-types' of https://github.com...

* 'szaydel/solaris-Wincompatible-pointer-types' of https://github.com/szaydel/fio:
  Fix incompatible pointer types warning on Solaris with gcc 6.4

diff --git a/engines/solarisaio.c b/engines/solarisaio.c
index 151f31d4822cb2e657f097ddafa3a46a84e7930b..21e95935b20bdc387a41f5c176fd806ff3c8f504 100644 (file)
--- a/engines/solarisaio.c
+++ b/engines/solarisaio.c
@@ -105,7 +105,7 @@ static struct io_u *fio_solarisaio_event(struct thread_data *td, int event)
        return sd->aio_events[event];
 }
 
-static int fio_solarisaio_queue(struct thread_data fio_unused *td,
+static enum fio_q_status fio_solarisaio_queue(struct thread_data fio_unused *td,
                              struct io_u *io_u)
 {
        struct solarisaio_data *sd = td->io_ops_data;