* src/2geom/isnan.h, src/libcola/cola.cpp, src/style.cpp, src/seltrans.cpp,

    src/libcola/gradient_projection.cpp, src/libvpsc/generate-constraints.cpp,
    src/libnr/nr-types.cpp, src/libnr/nr-point-fns-test.cpp, src/isnan.h,
    src/libnr/nr-point-fns.cpp, src/libnr/in-svg-plane-test.cpp,
    src/doxygen-main.cpp, src/display/nr-filter-composite.cpp,
    src/display/nr-filter-merge.cpp, src/display/nr-filter-gaussian.cpp,
    src/display/bezier-utils.cpp, src/Makefile_insert, src/eraser-context.cpp,
    src/dyna-draw-context.cpp, src/tweak-context.cpp, src/sp-namedview.cpp,
    src/libnr/in-svg-plane-test.h, src/libnr/nr-point-fns-test.h,
    src/mod360-test.h, src/CMakeLists.txt, src/2geom/linear.h:

    Properly fix the conflicting isnan.h problem:
      1) Update src/2geom/isnan.h to match newest Inkscape src/isnana.h
         (Also commited this change to lib2geom project repository)
      2) Remove Inkscape's src/isnan.h
      3) Update all files to include src/2geom/isnan.h instead of src/isnan.h

(bzr r6013)

6 files changed, 6 insertions, 6 deletions

diff --git a/src/libnr/in-svg-plane-test.cpp b/src/libnr/in-svg-plane-test.cpp
index 138812655..061333cbb 100644
--- a/src/libnr/in-svg-plane-test.cpp
+++ b/src/libnr/in-svg-plane-test.cpp
@@ -3,7 +3,7 @@
 
 #include "libnr/in-svg-plane.h"
 #include "utest/utest.h"
-#include "isnan.h"
+#include "2geom/isnan.h"
 
 int main(int argc, char *argv[])
 {
diff --git a/src/libnr/in-svg-plane-test.h b/src/libnr/in-svg-plane-test.h
index ced9f978c..304182fed 100644
--- a/src/libnr/in-svg-plane-test.h
+++ b/src/libnr/in-svg-plane-test.h
@@ -4,7 +4,7 @@
 #include <cmath>
 
 #include "libnr/in-svg-plane.h"
-#include "isnan.h"
+#include "2geom/isnan.h"
 
 class InSvgPlaneTest : public CxxTest::TestSuite
 {
diff --git a/src/libnr/nr-point-fns-test.cpp b/src/libnr/nr-point-fns-test.cpp
index 00a704b59..312055fee 100644
--- a/src/libnr/nr-point-fns-test.cpp
+++ b/src/libnr/nr-point-fns-test.cpp
@@ -5,7 +5,7 @@
 
 #include "utest/utest.h"
 #include "libnr/nr-point-fns.h"
-#include "isnan.h"
+#include "2geom/isnan.h"
 
 using NR::Point;
 
diff --git a/src/libnr/nr-point-fns-test.h b/src/libnr/nr-point-fns-test.h
index a94ef1b73..bd6605802 100644
--- a/src/libnr/nr-point-fns-test.h
+++ b/src/libnr/nr-point-fns-test.h
@@ -7,7 +7,7 @@
 #include <stdlib.h>
 
 #include "libnr/nr-point-fns.h"
-#include "isnan.h"
+#include "2geom/isnan.h"
 
 using NR::Point;
 
diff --git a/src/libnr/nr-point-fns.cpp b/src/libnr/nr-point-fns.cpp
index f73f71e3b..5082c3a10 100644
--- a/src/libnr/nr-point-fns.cpp
+++ b/src/libnr/nr-point-fns.cpp
@@ -1,5 +1,5 @@
 #include <libnr/nr-point-fns.h>
-#include <isnan.h>
+#include <2geom/isnan.h>
 
 using NR::Point;
 
diff --git a/src/libnr/nr-types.cpp b/src/libnr/nr-types.cpp
index a4e16d127..4da711cc0 100644
--- a/src/libnr/nr-types.cpp
+++ b/src/libnr/nr-types.cpp
@@ -4,7 +4,7 @@
 
 #include <libnr/nr-types.h>
 
-#include "isnan.h" //temporary fix for isnan()
+#include "2geom/isnan.h"
 
 /** Scales this vector to make it a unit vector (within rounding error).
  *