From 3023aa795c8fb3d1e19043b4e5e4b09278a8a460 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= <jerome.gardou@reactos.org>
Date: Tue, 21 Aug 2012 09:29:11 +0000
Subject: [PATCH] [INCLUDES] - Move NAN and INFINITY definition from
 wine/math.h to wine/port.h - Delete wine/math.h - Fix build

svn path=/trunk/; revision=57122
---
 .../directx/wine/wined3d/wined3d_private.h    |  1 +
 reactos/include/reactos/wine/math.h           | 26 -------------------
 reactos/include/reactos/wine/port.h           | 18 +++++++++++++
 3 files changed, 19 insertions(+), 26 deletions(-)
 delete mode 100644 reactos/include/reactos/wine/math.h

diff --git a/reactos/dll/directx/wine/wined3d/wined3d_private.h b/reactos/dll/directx/wine/wined3d/wined3d_private.h
index 3070ae3e9e7..4233c9e7b5b 100644
--- a/reactos/dll/directx/wine/wined3d/wined3d_private.h
+++ b/reactos/dll/directx/wine/wined3d/wined3d_private.h
@@ -37,6 +37,7 @@
 #include "winuser.h"
 #include "wine/debug.h"
 #include "wine/unicode.h"
+#include "wine/port.h"
 
 #include "objbase.h"
 #include "wine/wined3d.h"
diff --git a/reactos/include/reactos/wine/math.h b/reactos/include/reactos/wine/math.h
deleted file mode 100644
index 1d86ef9a7df..00000000000
--- a/reactos/include/reactos/wine/math.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef __WINE_MATH_H_
-#define __WINE_MATH_H_
-
-#include <crt/math.h>
-
-#ifdef _MSC_VER
-__forceinline float _NaN()
-{
-    unsigned long NaN = 0x7fc00000;
-    return *(float*)&NaN;
-}
-#define NAN _NaN()
-
-__forceinline float _Infinity()
-{
-    unsigned long Infinity = 0x7f800000;
-    return *(float*)&Infinity;
-}
-#define INFINITY _Infinity()
-
-#else
-#define NAN (0.0f / 0.0f)
-#define INFINITY (1.0F/0.0F)
-#endif
-
-#endif /* __WINE_MATH_H_ */
diff --git a/reactos/include/reactos/wine/port.h b/reactos/include/reactos/wine/port.h
index f3714531675..12663671eb1 100644
--- a/reactos/include/reactos/wine/port.h
+++ b/reactos/include/reactos/wine/port.h
@@ -151,6 +151,24 @@ struct statfs;
 #define M_PI_4 0.785398163397448309616
 #endif
 
+#ifndef INFINITY
+static inline float __port_infinity(void)
+{
+    static const unsigned __inf_bytes = 0x7f800000;
+    return *(const float *)&__inf_bytes;
+}
+#define INFINITY __port_infinity()
+#endif
+
+#ifndef NAN
+static inline float __port_nan(void)
+{
+    static const unsigned __nan_bytes = 0x7fc00000;
+    return *(const float *)&__nan_bytes;
+}
+#define NAN __port_nan()
+#endif
+
 /* Constructor functions */
 
 #ifdef _MSC_VER