1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
Description: Fix compilation under boost v 1.48
Origin: upstream, https://github.com/hoijui/spring/commit/3eb37538a78dfc8ac394a4bd6747372f23b6b3e3
Reviewed-by: Marco Amadori <marco.amadori@gmail.com>
Bug: http://springrts.com/mantis/view.php?id=2768
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=660450
diff --git a/rts/lib/assimp/code/StandardShapes.cpp b/rts/lib/assimp/code/StandardShapes.cpp
index b284824..b038f77 100644
--- a/rts/lib/assimp/code/StandardShapes.cpp
+++ b/rts/lib/assimp/code/StandardShapes.cpp
@@ -45,8 +45,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* http://geometrictools.com/Documentation/PlatonicSolids.pdf.
*/
-#include "lib/streflop/streflop_cond.h"
#include "AssimpPCH.h"
+#include "lib/streflop/streflop_cond.h"
#include "StandardShapes.h"
#include "System/FastMath.h"
diff --git a/rts/lib/streflop/FPUSettings.h b/rts/lib/streflop/FPUSettings.h
index bfc20c1..af87847 100644
--- a/rts/lib/streflop/FPUSettings.h
+++ b/rts/lib/streflop/FPUSettings.h
@@ -56,7 +56,7 @@ namespace streflop {
// Give warning in case these flags would be defined already, this is indication
// of potential confusion!
-#if defined(FE_INVALID) || defined(FE_DENORMAL) || defined(FE_DIVBYZERO) || defined(FE_OVERFLOW) || defined(FE_UNDERFLOW) || defined(FE_INEXACT) || defined(FE_DOWNWARD) || defined(FE_TONEAREST) || defined(FE_TOWARDZERO) || defined(FE_UPWARD)
+#if defined(FE_INVALID) || defined(FE_DENORMAL) || defined(FE_DIVBYZERO) || defined(FE_OVERFLOW) || defined(FE_UNDERFLOW) || defined(FE_INEXACT) || defined(FE_DOWNWARD) || defined(FE_TONEAREST) || defined(FE_TOWARDZERO) || defined(FE_UPWARD) || defined(FE_DFL_ENV)
#warning STREFLOP: FE_XXX flags were already defined and will be redefined! Check you do not use the system libm.
#undef FE_INVALID
@@ -71,6 +71,7 @@ namespace streflop {
#undef FE_TONEAREST
#undef FE_TOWARDZERO
#undef FE_UPWARD
+#undef FE_DFL_ENV
#endif // defined(FE_INVALID) || ...
|
