From e2e58886427019b525d2a234c5404a38ec0c7ebf Mon Sep 17 00:00:00 2001
From: Jens Axboe <jaxboe@fusionio.com>
Date: Tue, 4 Jan 2011 08:36:06 +0100
Subject: [PATCH 1/1] OS headers need fio_file definition now

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
---
 file.h          | 1 +
 os/os-aix.h     | 2 ++
 os/os-freebsd.h | 2 ++
 os/os-linux.h   | 3 ++-
 os/os-mac.h     | 2 ++
 os/os-netbsd.h  | 2 ++
 os/os-solaris.h | 2 ++
 7 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/file.h b/file.h
index 10c5379c..7948a412 100644
--- a/file.h
+++ b/file.h
@@ -1,6 +1,7 @@
 #ifndef FIO_FILE_H
 #define FIO_FILE_H
 
+#include <string.h>
 #include "compiler/compiler.h"
 #include "io_ddir.h"
 #include "flist.h"
diff --git a/os/os-aix.h b/os/os-aix.h
index b5ee5bb3..8e4a71d5 100644
--- a/os/os-aix.h
+++ b/os/os-aix.h
@@ -6,6 +6,8 @@
 #include <sys/devinfo.h>
 #include <sys/ioctl.h>
 
+#include "../file.h"
+
 #define FIO_HAVE_POSIXAIO
 #define FIO_HAVE_ODIRECT
 #define FIO_USE_GENERIC_RAND
diff --git a/os/os-freebsd.h b/os/os-freebsd.h
index 0cb7ae5e..1f114f8c 100644
--- a/os/os-freebsd.h
+++ b/os/os-freebsd.h
@@ -5,6 +5,8 @@
 #include <sys/sysctl.h>
 #include <sys/disk.h>
 
+#include "../file.h"
+
 #define FIO_HAVE_POSIXAIO
 #define FIO_HAVE_ODIRECT
 #define FIO_HAVE_IOPRIO
diff --git a/os/os-linux.h b/os/os-linux.h
index aab74e58..70c993b5 100644
--- a/os/os-linux.h
+++ b/os/os-linux.h
@@ -15,6 +15,7 @@
 
 #include "indirect.h"
 #include "binject.h"
+#include "../file.h"
 
 #define FIO_HAVE_LIBAIO
 #define FIO_HAVE_POSIXAIO
@@ -193,7 +194,7 @@ enum {
 #define BLKDISCARD	_IO(0x12,119)
 #endif
 
-static inline int blockdev_invalidate_cache(struct fio_file *fd)
+static inline int blockdev_invalidate_cache(struct fio_file *f)
 {
 	return ioctl(f->fd, BLKFLSBUF);
 }
diff --git a/os/os-mac.h b/os/os-mac.h
index 39a2f827..068bc5c8 100644
--- a/os/os-mac.h
+++ b/os/os-mac.h
@@ -4,6 +4,8 @@
 #include <errno.h>
 #include <sys/sysctl.h>
 
+#include "../file.h"
+
 #ifndef CLOCK_MONOTONIC
 #define CLOCK_MONOTONIC 1
 #endif
diff --git a/os/os-netbsd.h b/os/os-netbsd.h
index ecfcddbb..6478f30d 100644
--- a/os/os-netbsd.h
+++ b/os/os-netbsd.h
@@ -10,6 +10,8 @@
 #undef rb_left
 #undef rb_right
 
+#include "../file.h"
+
 #define FIO_HAVE_POSIXAIO
 #define FIO_HAVE_FADVISE
 #define FIO_HAVE_ODIRECT
diff --git a/os/os-solaris.h b/os/os-solaris.h
index 14164b01..e292172d 100644
--- a/os/os-solaris.h
+++ b/os/os-solaris.h
@@ -7,6 +7,8 @@
 #include <sys/fcntl.h>
 #include <sys/pset.h>
 
+#include "../file.h"
+
 #define FIO_HAVE_POSIXAIO
 #define FIO_HAVE_SOLARISAIO
 #define FIO_HAVE_FALLOCATE
-- 
2.25.1