From: Stefanus Du Toit <stefanus.dutoit@rapidmind.com>
Date: Tue, 28 Jul 2009 13:41:07 +0000 (+0000)
Subject: Include cmath/math.h in DataTypes.h regardless of whether MSVC is being used.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9b97fc785b5a925966c70919c2ee2889f4beff7e;p=oota-llvm.git

Include cmath/math.h in DataTypes.h regardless of whether MSVC is being used.

Fixes MSVC build of LiveInterval.cpp.

Patch by Nicolas Capens.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@77317 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/Support/DataTypes.h.cmake b/include/llvm/Support/DataTypes.h.cmake
index dddc1d194cb..25d55514ecb 100644
--- a/include/llvm/Support/DataTypes.h.cmake
+++ b/include/llvm/Support/DataTypes.h.cmake
@@ -30,6 +30,12 @@
 // FIXME: UGLY HACK (Added by Kevin)
 #define HAVE_UINT64_T 1
 
+#ifdef __cplusplus
+#include <cmath>
+#else
+#include <math.h>
+#endif
+
 #ifndef _MSC_VER
 
 // Note that this header's correct operation depends on __STDC_LIMIT_MACROS
@@ -58,12 +64,6 @@
 #include <stdint.h>
 #endif
 
-#ifdef __cplusplus
-#include <cmath>
-#else
-#include <math.h>
-#endif
-
 #ifdef _AIX
 #include "llvm/Support/AIXDataTypesFix.h"
 #endif
diff --git a/include/llvm/Support/DataTypes.h.in b/include/llvm/Support/DataTypes.h.in
index 72063f7d2ad..f63ca097b5d 100644
--- a/include/llvm/Support/DataTypes.h.in
+++ b/include/llvm/Support/DataTypes.h.in
@@ -27,6 +27,12 @@
 #undef HAVE_UINT64_T
 #undef HAVE_U_INT64_T
 
+#ifdef __cplusplus
+#include <cmath>
+#else
+#include <math.h>
+#endif
+
 #ifndef _MSC_VER
 
 // Note that this header's correct operation depends on __STDC_LIMIT_MACROS
@@ -55,12 +61,6 @@
 #include <stdint.h>
 #endif
 
-#ifdef __cplusplus
-#include <cmath>
-#else
-#include <math.h>
-#endif
-
 #ifdef _AIX
 #include "llvm/Support/AIXDataTypesFix.h"
 #endif