diff options
| author | Markus Schwarzenberg <schwarzenberg@users.sourceforge.net> | 2007-03-01 14:55:54 +0000 |
|---|---|---|
| committer | schwarzenberg <schwarzenberg@users.sourceforge.net> | 2007-03-01 14:55:54 +0000 |
| commit | a1f4da7cf5d62d179039a121b97365bbd705fb37 (patch) | |
| tree | dfaca4bbbb51574ee41b934e771bcda1c1cb1aa3 /src | |
| parent | commited Solaris 2.8 / gcc-3.2.3 fixes (diff) | |
| download | inkscape-a1f4da7cf5d62d179039a121b97365bbd705fb37.tar.gz inkscape-a1f4da7cf5d62d179039a121b97365bbd705fb37.zip | |
(hopefully) fixed build on linux, added missing isnormal.h
(bzr r2486)
Diffstat (limited to 'src')
| -rw-r--r-- | src/display/nr-filter.cpp | 2 | ||||
| -rw-r--r-- | src/display/pixblock-transform.cpp | 2 | ||||
| -rw-r--r-- | src/isnormal.h | 19 | ||||
| -rw-r--r-- | src/widgets/desktop-widget.cpp | 3 |
4 files changed, 26 insertions, 0 deletions
diff --git a/src/display/nr-filter.cpp b/src/display/nr-filter.cpp index d2f459149..07c264928 100644 --- 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 2d5abc62c..a4fd2b98b 100644 --- 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 index 000000000..6587331c3 --- /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 93b579adf..eb813a2a2 100644 --- 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 |