Merge branch 'fio-c++-engine' of https://github.com/tchaikov/fio

* 'fio-c++-engine' of https://github.com/tchaikov/fio:
  replace typeof with __typeof__

diff --combined verify.c
index 0f2c1182a60962fb64595a02fccec36bd156df4a,1bb67519b9658276c39b9f88a7aa7ef6643861e8..01492f24f9a0336c3b09ebb295aa0afe6963c4bd
--- 1/verify.c
--- 2/verify.c
+++ b/verify.c
@@@ -801,7 -801,7 +801,7 @@@ static int verify_trimmed_io_u(struct t
  
        mem_is_zero_slow(io_u->buf, io_u->buflen, &offset);
  
 -      log_err("trim: verify failed at file %s offset %llu, length %lu"
 +      log_err("trim: verify failed at file %s offset %llu, length %llu"
                ", block offset %lu\n",
                        io_u->file->file_name, io_u->offset, io_u->buflen,
                        (unsigned long) offset);
@@@ -1517,7 -1517,7 +1517,7 @@@ int paste_blockoff(char *buf, unsigned 
        struct io_u *io = priv;
        unsigned long long off;
  
-       typecheck(typeof(off), io->offset);
+       typecheck(__typeof__(off), io->offset);
        off = cpu_to_le64((uint64_t)io->offset);
        len = min(len, (unsigned int)sizeof(off));
        memcpy(buf, &off, len);