Merge branch 'travis-xcode11.2-python' of https://github.com/vincentkfu/fio

* 'travis-xcode11.2-python' of https://github.com/vincentkfu/fio:
  .travis.yml: xcode11.2 scipy issue

diff --git a/FIO-VERSION-GEN b/FIO-VERSION-GEN
index d5cec22e8056808b29805e1fe336c94c5449b3fb..13ce8c16c2aec9abbf1865e4160cb047982bf7b7 100755 (executable)
--- a/FIO-VERSION-GEN
+++ b/FIO-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=FIO-VERSION-FILE
-DEF_VER=fio-3.16
+DEF_VER=fio-3.17
 
 LF='
 '

diff --git a/t/io_uring.c b/t/io_uring.c
index 62dee8058a5922b673a4e5c92c65add6735f4574..c2e5e0989ee9a4f84096f95def112b38e1b41153 100644 (file)
--- a/t/io_uring.c
+++ b/t/io_uring.c
@@ -133,10 +133,12 @@ static int io_uring_enter(struct submitter *s, unsigned int to_submit,
                        min_complete, flags, NULL, 0);
 }
 
+#ifndef CONFIG_HAVE_GETTID
 static int gettid(void)
 {
        return syscall(__NR_gettid);
 }
+#endif
 
 static unsigned file_depth(struct submitter *s)
 {