From 03dcce40b22074dceb06670a8962ef2e18f36da6 Mon Sep 17 00:00:00 2001
From: xorstream <xorstream@users.noreply.github.com>
Date: Sun, 22 Jan 2017 18:13:28 +1100
Subject: [PATCH] isnan() fix for msvc2013 onwards

---
 qemu/include/qemu/compiler.h   | 6 ++++++
 qemu/include/qemu/host-utils.h | 9 ---------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/qemu/include/qemu/compiler.h b/qemu/include/qemu/compiler.h
index e74e7119..20909ea0 100644
--- a/qemu/include/qemu/compiler.h
+++ b/qemu/include/qemu/compiler.h
@@ -17,7 +17,13 @@
 
 #if _MSC_VER < MSC_VER_VS2013
 #define isinf(x) (!_finite(x))
+#if defined(_WIN64)
+#define isnan	_isnanf
+#else
+#define isnan	_isnan
 #endif
+#endif
+
 
 static double rint( double x )
 {
diff --git a/qemu/include/qemu/host-utils.h b/qemu/include/qemu/host-utils.h
index d8707451..f6157cfd 100644
--- a/qemu/include/qemu/host-utils.h
+++ b/qemu/include/qemu/host-utils.h
@@ -379,13 +379,4 @@ static inline int ctpop64(uint64_t val)
 # error Unknown sizeof long
 #endif
 
-#ifdef _MSC_VER
-#include <float.h>
-#if defined(_WIN64)
-#define isnan	_isnanf
-#else
-#define isnan	_isnan
-#endif
-#endif
-
 #endif