[vidalia-svn] r3620: Backport r3619 and give it a changelog entry. (in vidalia/branches/vidalia-0.1: . src/vidalia/network)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-03-16 15:08:30 -0400 (Mon, 16 Mar 2009)
New Revision: 3620

Modified:
   vidalia/branches/vidalia-0.1/CHANGELOG
   vidalia/branches/vidalia-0.1/src/vidalia/network/tormapwidget.cpp
Log:

Backport r3619 and give it a changelog entry.


Modified: vidalia/branches/vidalia-0.1/CHANGELOG
===================================================================
--- vidalia/branches/vidalia-0.1/CHANGELOG	2009-03-16 19:00:58 UTC (rev 3619)
+++ vidalia/branches/vidalia-0.1/CHANGELOG	2009-03-16 19:08:30 UTC (rev 3620)
@@ -1,6 +1,8 @@
 0.1.12  xx-xxx-2009
   o Fix a bug in the hidden service settings configuration class that
     could lead to compile errors in Visual Studio and on IRIX.
+  o Fix a build error that occurred on IRIX when using the MIPSPro
+    compiler. Patch from Matthew Saunier.
   o Remove two duplicated strings in the Spanish translation of Qt's
     internal strings (qt_es.po). The duplicated strings caused build
     errors when building with Qt 4.5. (Ticket #469)

Modified: vidalia/branches/vidalia-0.1/src/vidalia/network/tormapwidget.cpp
===================================================================
--- vidalia/branches/vidalia-0.1/src/vidalia/network/tormapwidget.cpp	2009-03-16 19:00:58 UTC (rev 3619)
+++ vidalia/branches/vidalia-0.1/src/vidalia/network/tormapwidget.cpp	2009-03-16 19:08:30 UTC (rev 3620)
@@ -15,7 +15,13 @@
 */
 
 #include <QStringList>
+
+#if defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION >= 730
+#include <math.h>
+#else
 #include <cmath>
+#endif
+
 #include "tormapwidget.h"
 
 #define IMG_WORLD_MAP   ":/images/map/world-map.png"