From 4700b23465687c7d3de7820341fa96e506e967b2 Mon Sep 17 00:00:00 2001
From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 24 Jan 2013 15:33:33 -0700
Subject: [PATCH 1/1] configure: solaris and windowsaio fixups

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---
 Makefile        | 6 +++++-
 configure       | 1 +
 fio.h           | 2 +-
 options.c       | 2 +-
 os/os-windows.h | 1 -
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 84988f8a..dab6e888 100644
--- a/Makefile
+++ b/Makefile
@@ -80,6 +80,10 @@ ifdef CONFIG_SOLARISAIO
   CFLAGS += -DCONFIG_SOLARISAIO
   SOURCE += engines/solarisaio.c
 endif
+ifdef CONFIG_WINDOWSAIO
+  CFLAGS += -DCONFIG_WINDOWSAIO
+  SOURCE += engines/windowsaio.c
+endif
 
 ifndef CONFIG_STRSEP
   CFLAGS += -DCONFIG_STRSEP
@@ -184,7 +188,7 @@ ifeq ($(UNAME), Darwin)
 endif
 ifneq (,$(findstring CYGWIN,$(UNAME)))
   SOURCE := $(filter-out engines/mmap.c,$(SOURCE))
-  SOURCE += engines/windowsaio.c os/windows/posix.c
+  SOURCE += os/windows/posix.c
   LIBS	 += -lpthread -lpsapi -lws2_32
   CFLAGS += -DPSAPI_VERSION=1 -Ios/windows/posix/include -Wno-format
 endif
diff --git a/configure b/configure
index cfd8c8ac..3f5037cb 100755
--- a/configure
+++ b/configure
@@ -165,6 +165,7 @@ CYGWIN*)
   echo "CONFIG_FADVISE=y"          >> $config_host_mak
   echo "CONFIG_SFAA=y"             >> $config_host_mak
   echo "CONFIG_RUSAGE_THREAD=y"    >> $config_host_mak
+  echo "CONFIG_WINDOWSAIO=y"       >> $config_host_mak
   exit 0
 esac
 
diff --git a/fio.h b/fio.h
index 1ff384fd..3a263351 100644
--- a/fio.h
+++ b/fio.h
@@ -40,7 +40,7 @@ struct thread_data;
 #include "stat.h"
 #include "flow.h"
 
-#ifdef FIO_HAVE_SOLARISAIO
+#ifdef CONFIG_SOLARISAIO
 #include <sys/asynch.h>
 #endif
 
diff --git a/options.c b/options.c
index 16c7995f..1009df34 100644
--- a/options.c
+++ b/options.c
@@ -1282,7 +1282,7 @@ static struct fio_option options[FIO_MAX_OPTS] = {
 			    .help = "Solaris native asynchronous IO",
 			  },
 #endif
-#ifdef FIO_HAVE_WINDOWSAIO
+#ifdef CONFIG_WINDOWSAIO
 			  { .ival = "windowsaio",
 			    .help = "Windows native asynchronous IO"
 			  },
diff --git a/os/os-windows.h b/os/os-windows.h
index 3a856374..64808bb9 100644
--- a/os/os-windows.h
+++ b/os/os-windows.h
@@ -21,7 +21,6 @@
 #define FIO_HAVE_CPU_AFFINITY
 #define FIO_HAVE_CHARDEV_SIZE
 #define FIO_HAVE_FDATASYNC
-#define FIO_HAVE_WINDOWSAIO
 #define FIO_HAVE_GETTID
 #define FIO_USE_GENERIC_RAND
 
-- 
2.25.1