(hopefully) fixed build on linux, added missing isnormal.h

diff --git a/src/display/nr-filter.cpp b/src/display/nr-filter.cpp
index d2f459149575331ed447227b500b6108f1dad171..07c2649289b128fa9b9657ab3cd171ce4b390251 100644 (file)
--- a/src/display/nr-filter.cpp
+++ b/src/display/nr-filter.cpp
@@ -29,8 +29,10 @@
 #include "libnr/nr-scale.h"
 #include "svg/svg-length.h"
 #include "sp-filter-units.h"
+#if defined (SOLARIS_2_8)
 #include "round.h"
 using Inkscape::round;
+#endif 
 
 //#include "display/nr-arena-shape.h"
 

diff --git a/src/display/pixblock-transform.cpp b/src/display/pixblock-transform.cpp
index 2d5abc62c11a9910f4461710222ca93872bb4771..a4fd2b98b75fee9abd75fa21f607d9d8cdaf7cab 100644 (file)
--- a/src/display/pixblock-transform.cpp
+++ b/src/display/pixblock-transform.cpp
@@ -13,8 +13,10 @@
 
 #include <glib.h>
 #include <cmath>
+#if defined (SOLARIS_2_8)
 #include "round.h"
 using Inkscape::round;
+#endif 
 using std::floor;
 
 #include "libnr/nr-pixblock.h"

diff --git a/src/isnormal.h b/src/isnormal.h
new file mode 100644 (file)
index 0000000..6587331
--- /dev/null
+++ b/src/isnormal.h
@@ -0,0 +1,19 @@
+#ifndef __ISNORMAL_H__
+#define __ISNORMAL_H__
+
+/*
+ * Fix for missing std::isnormal with SOLARIS8/GCC3.2
+ */
+ 
+#if defined (SOLARIS_2_8) && __GNUC__ == 3 && __GNUC_MINOR__ == 2
+
+       #include <ieeefp.h>
+       #define isnormal(x) (fpclass(x) >= FP_NZERO)
+  
+#else
+
+       using std::isnormal;
+       
+#endif
+
+#endif /* __ISNORMAL_H__ */

diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 93b579adfcb7f0198858ae1fe1117b0940e8c5da..eb813a2a2dba7a1a69c10d5af42daef735199935 100644 (file)
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -52,8 +52,11 @@
 #include "sp-item.h"
 #include "dialogs/swatches.h"
 #include "conn-avoid-ref.h"
+
+#if defined (SOLARIS_2_8)
 #include "round.h"
 using Inkscape::round;
+#endif 
 
 #ifdef WITH_INKBOARD
 #endif