[vidalia-svn] r3619: Apparently the MIPSPro compiler has cmath, but not a cmath t (in vidalia/trunk: . src/vidalia/network)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-03-16 15:00:58 -0400 (Mon, 16 Mar 2009)
New Revision: 3619

Modified:
   vidalia/trunk/CMakeLists.txt
   vidalia/trunk/config.h.in
   vidalia/trunk/src/vidalia/network/tormapimageview.cpp
Log:

Apparently the MIPSPro compiler has cmath, but not a cmath that has the
function we want. So revert my patch and just go with the one that the
IRIX dude says actually works.


Modified: vidalia/trunk/CMakeLists.txt
===================================================================
--- vidalia/trunk/CMakeLists.txt	2009-03-12 05:06:19 UTC (rev 3618)
+++ vidalia/trunk/CMakeLists.txt	2009-03-16 19:00:58 UTC (rev 3619)
@@ -104,8 +104,6 @@
 ## Check for system header files
 check_include_file("limits.h" HAVE_LIMITS_H)
 check_include_file("sys/limits.h" HAVE_SYS_LIMITS_H)
-check_include_file("math.h"  HAVE_MATH_H)
-check_include_file_cxx("cmath" HAVE_CMATH)
 
 ## Check for the sizes of various data types
 check_type_size(int SIZEOF_INT)

Modified: vidalia/trunk/config.h.in
===================================================================
--- vidalia/trunk/config.h.in	2009-03-12 05:06:19 UTC (rev 3618)
+++ vidalia/trunk/config.h.in	2009-03-16 19:00:58 UTC (rev 3619)
@@ -24,10 +24,6 @@
 
 #cmakedefine HAVE_SYS_LIMITS_H
 
-#cmakedefine HAVE_MATH_H
-
-#cmakedefine HAVE_CMATH
-
 #cmakedefine SIZEOF_INT @SIZEOF_INT@
 
 #cmakedefine USE_MINIUPNPC

Modified: vidalia/trunk/src/vidalia/network/tormapimageview.cpp
===================================================================
--- vidalia/trunk/src/vidalia/network/tormapimageview.cpp	2009-03-12 05:06:19 UTC (rev 3618)
+++ vidalia/trunk/src/vidalia/network/tormapimageview.cpp	2009-03-16 19:00:58 UTC (rev 3619)
@@ -17,10 +17,10 @@
 #include <QStringList>
 #include <config.h>
 
-#if defined(HAVE_CMATH)
+#if defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION >= 730
+#include <math.h>
+#else
 #include <cmath>
-#elif defined(HAVE_MATH_H)
-#include <math.h>
 #endif
 
 #include "tormapimageview.h"