From aef141460e6e78adb35e8bf4d39dcf4e2a4efebc Mon Sep 17 00:00:00 2001 From: mjwybrow Date: Sun, 22 Jun 2008 03:49:00 +0000 Subject: * 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) --- src/libcola/cola.cpp | 2 +- src/libcola/gradient_projection.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libcola') diff --git a/src/libcola/cola.cpp b/src/libcola/cola.cpp index 2119ea981..2a3b525a7 100644 --- a/src/libcola/cola.cpp +++ b/src/libcola/cola.cpp @@ -2,7 +2,7 @@ #include "conjugate_gradient.h" #include "straightener.h" #include "shortest_paths.h" -#include "isnan.h" +#include "2geom/isnan.h" namespace cola { diff --git a/src/libcola/gradient_projection.cpp b/src/libcola/gradient_projection.cpp index 237cb94af..fb8702ec7 100644 --- a/src/libcola/gradient_projection.cpp +++ b/src/libcola/gradient_projection.cpp @@ -17,7 +17,7 @@ #include #include "gradient_projection.h" #include -#include "isnan.h" +#include "2geom/isnan.h" #include "isinf.h" #include -- cgit v1.2.3