On Mon, 2008-08-04 at 11:28, Fabian Groffen wrote: > Ah, thanks. I just thought I'd seen this sort of horror before. I > really don't understand why each subdir has its own (differing) isnan.h > definitions. Anyway, I'll take your patch and replace it with mine. IIRC (lib)2geom and Inkscape have been separate projects before, so perhaps no one dared to merge their config files. :-)
> Aparently it did compile and work for me with my own patch, but that's > on x86-solaris. Your patch keeps on failing to apply to me though. Sorry, my fault again, seems like my email program messed up spaces/tabs/newlines, so I am trying to resend it as attachment. Just to avoid any confusion: my patch is against $EPREFIX/usr/portage/media-gfx/inkscape/files/inkscape-0.46-solaris.patch.
Index: inkscape-0.46-solaris.patch =================================================================== --- inkscape-0.46-solaris.patch (revision 29100) +++ inkscape-0.46-solaris.patch (working copy) @@ -40,12 +40,13 @@ #else # define is_nan(_a) (std::isnan(_a)) #endif -@@ -49,6 +51,8 @@ +@@ -49,6 +51,9 @@ # define is_finite(_a) (__isfinite(_a)) /* MacOSX/Darwin definition < 10.4 */ #elif defined(isfinite) # define is_finite(_a) (isfinite(_a)) +#elif defined(__sun__) && defined(__GNUC__) -+# define is_finite(_a) (__builtin_isfinite(_a)) ++#include <ieeefp.h> ++#define is_finite(_a) (finite(_a) && !is_nan(_a)) #else # define is_finite(_a) (std::isfinite(_a)) #endif
