From ef3c94b62e3f58cc23c3ad50450150c8474b4285 Mon Sep 17 00:00:00 2001 From: Daniel Gollub Date: Wed, 30 Apr 2014 11:25:04 +0200 Subject: [PATCH] Rename time.h for third-party include of fio.h External project might build external ioengines and need to include there for fio.h. If a project set the include path to the fio root source directory and the third-party source holds an "time.h" as well things get complicated. Signed-off-by: Daniel Gollub Cc: Daniel Gollub Signed-off-by: Jens Axboe --- fio.h | 2 +- time.h => fio_time.h | 0 mutex.c | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename time.h => fio_time.h (100%) diff --git a/fio.h b/fio.h index 9eecba36..ed034cbb 100644 --- a/fio.h +++ b/fio.h @@ -30,7 +30,7 @@ #include "helpers.h" #include "options.h" #include "profile.h" -#include "time.h" +#include "fio_time.h" #include "gettime.h" #include "lib/getopt.h" #include "lib/rand.h" diff --git a/time.h b/fio_time.h similarity index 100% rename from time.h rename to fio_time.h diff --git a/mutex.c b/mutex.c index 466e20ed..9d10c2ce 100644 --- a/mutex.c +++ b/mutex.c @@ -15,7 +15,7 @@ #include "arch/arch.h" #include "os/os.h" #include "helpers.h" -#include "time.h" +#include "fio_time.h" #include "gettime.h" void fio_mutex_remove(struct fio_mutex *mutex) -- 2.25.1