summaryrefslogtreecommitdiffstats
path: root/extra/geos
diff options
context:
space:
mode:
authorlesibel <lesibel@free.fr>2009-11-10 14:43:22 +0100
committerlesibel <lesibel@free.fr>2009-11-10 14:43:22 +0100
commitdad5816b072c335fda889187e2dddb675adf67b9 (patch)
treedcffc45a578c4fab0d11f2a89de6d1ea70aeeb5c /extra/geos
parent54b397763ebf4c283256dbfe1ab163c356aa3186 (diff)
downloadnutyx-extra-dad5816b072c335fda889187e2dddb675adf67b9.tar.gz
nutyx-extra-dad5816b072c335fda889187e2dddb675adf67b9.tar.bz2
nutyx-extra-dad5816b072c335fda889187e2dddb675adf67b9.tar.xz
nutyx-extra-dad5816b072c335fda889187e2dddb675adf67b9.zip
Ajout de geos#3.1.1-1
Diffstat (limited to 'extra/geos')
-rw-r--r--extra/geos/.footprint215
-rw-r--r--extra/geos/.md5sum2
-rw-r--r--extra/geos/Pkgfile22
-rw-r--r--extra/geos/gcc4.3.patch141
4 files changed, 380 insertions, 0 deletions
diff --git a/extra/geos/.footprint b/extra/geos/.footprint
new file mode 100644
index 000000000..a1528fe6f
--- /dev/null
+++ b/extra/geos/.footprint
@@ -0,0 +1,215 @@
+drwxr-xr-x root/root usr/
+drwxr-xr-x root/root usr/bin/
+-rwxr-xr-x root/root usr/bin/geos-config
+drwxr-xr-x root/root usr/include/
+-rw-r--r-- root/root usr/include/geos.h
+drwxr-xr-x root/root usr/include/geos/
+drwxr-xr-x root/root usr/include/geos/algorithm/
+-rw-r--r-- root/root usr/include/geos/algorithm/LineIntersector.h
+-rw-r--r-- root/root usr/include/geos/algorithm/PointLocator.h
+drwxr-xr-x root/root usr/include/geos/algorithm/locate/
+-rw-r--r-- root/root usr/include/geos/geom.h
+drwxr-xr-x root/root usr/include/geos/geom/
+-rw-r--r-- root/root usr/include/geos/geom/BinaryOp.h
+-rw-r--r-- root/root usr/include/geos/geom/Coordinate.h
+-rw-r--r-- root/root usr/include/geos/geom/Coordinate.inl
+-rw-r--r-- root/root usr/include/geos/geom/CoordinateArraySequence.h
+-rw-r--r-- root/root usr/include/geos/geom/CoordinateArraySequenceFactory.h
+-rw-r--r-- root/root usr/include/geos/geom/CoordinateArraySequenceFactory.inl
+-rw-r--r-- root/root usr/include/geos/geom/CoordinateFilter.h
+-rw-r--r-- root/root usr/include/geos/geom/CoordinateList.h
+-rw-r--r-- root/root usr/include/geos/geom/CoordinateSequence.h
+-rw-r--r-- root/root usr/include/geos/geom/CoordinateSequenceFactory.h
+-rw-r--r-- root/root usr/include/geos/geom/Dimension.h
+-rw-r--r-- root/root usr/include/geos/geom/Envelope.h
+-rw-r--r-- root/root usr/include/geos/geom/Envelope.inl
+-rw-r--r-- root/root usr/include/geos/geom/Geometry.h
+-rw-r--r-- root/root usr/include/geos/geom/Geometry.inl
+-rw-r--r-- root/root usr/include/geos/geom/GeometryCollection.h
+-rw-r--r-- root/root usr/include/geos/geom/GeometryCollection.inl
+-rw-r--r-- root/root usr/include/geos/geom/GeometryComponentFilter.h
+-rw-r--r-- root/root usr/include/geos/geom/GeometryFactory.h
+-rw-r--r-- root/root usr/include/geos/geom/GeometryFactory.inl
+-rw-r--r-- root/root usr/include/geos/geom/GeometryFilter.h
+-rw-r--r-- root/root usr/include/geos/geom/GeometryList.h
+-rw-r--r-- root/root usr/include/geos/geom/IntersectionMatrix.h
+-rw-r--r-- root/root usr/include/geos/geom/LineSegment.h
+-rw-r--r-- root/root usr/include/geos/geom/LineSegment.inl
+-rw-r--r-- root/root usr/include/geos/geom/LineString.h
+-rw-r--r-- root/root usr/include/geos/geom/LinearRing.h
+-rw-r--r-- root/root usr/include/geos/geom/Location.h
+-rw-r--r-- root/root usr/include/geos/geom/MultiLineString.h
+-rw-r--r-- root/root usr/include/geos/geom/MultiLineString.inl
+-rw-r--r-- root/root usr/include/geos/geom/MultiPoint.h
+-rw-r--r-- root/root usr/include/geos/geom/MultiPolygon.h
+-rw-r--r-- root/root usr/include/geos/geom/MultiPolygon.inl
+-rw-r--r-- root/root usr/include/geos/geom/Point.h
+-rw-r--r-- root/root usr/include/geos/geom/Polygon.h
+-rw-r--r-- root/root usr/include/geos/geom/PrecisionModel.h
+-rw-r--r-- root/root usr/include/geos/geom/PrecisionModel.inl
+drwxr-xr-x root/root usr/include/geos/geom/prep/
+-rw-r--r-- root/root usr/include/geos/geom/prep/AbstractPreparedPolygonContains.h
+-rw-r--r-- root/root usr/include/geos/geom/prep/BasicPreparedGeometry.h
+-rw-r--r-- root/root usr/include/geos/geom/prep/PreparedGeometry.h
+-rw-r--r-- root/root usr/include/geos/geom/prep/PreparedGeometryFactory.h
+-rw-r--r-- root/root usr/include/geos/geom/prep/PreparedLineString.h
+-rw-r--r-- root/root usr/include/geos/geom/prep/PreparedLineStringIntersects.h
+-rw-r--r-- root/root usr/include/geos/geom/prep/PreparedPoint.h
+-rw-r--r-- root/root usr/include/geos/geom/prep/PreparedPolygon.h
+-rw-r--r-- root/root usr/include/geos/geom/prep/PreparedPolygonContains.h
+-rw-r--r-- root/root usr/include/geos/geom/prep/PreparedPolygonContainsProperly.h
+-rw-r--r-- root/root usr/include/geos/geom/prep/PreparedPolygonCovers.h
+-rw-r--r-- root/root usr/include/geos/geom/prep/PreparedPolygonIntersects.h
+-rw-r--r-- root/root usr/include/geos/geom/prep/PreparedPolygonPredicate.h
+drwxr-xr-x root/root usr/include/geos/geom/util/
+-rw-r--r-- root/root usr/include/geos/geom/util/ComponentCoordinateExtracter.h
+-rw-r--r-- root/root usr/include/geos/geom/util/CoordinateOperation.h
+-rw-r--r-- root/root usr/include/geos/geom/util/GeometryCombiner.h
+-rw-r--r-- root/root usr/include/geos/geom/util/GeometryEditor.h
+-rw-r--r-- root/root usr/include/geos/geom/util/GeometryEditorOperation.h
+-rw-r--r-- root/root usr/include/geos/geom/util/GeometryTransformer.h
+-rw-r--r-- root/root usr/include/geos/geom/util/LinearComponentExtracter.h
+-rw-r--r-- root/root usr/include/geos/geom/util/PointExtracter.h
+-rw-r--r-- root/root usr/include/geos/geom/util/PolygonExtracter.h
+-rw-r--r-- root/root usr/include/geos/geom/util/ShortCircuitedGeometryVisitor.h
+-rw-r--r-- root/root usr/include/geos/geomUtil.h
+-rw-r--r-- root/root usr/include/geos/geomgraph.h
+drwxr-xr-x root/root usr/include/geos/geomgraph/
+-rw-r--r-- root/root usr/include/geos/geomgraph/EdgeEnd.h
+-rw-r--r-- root/root usr/include/geos/geomgraph/EdgeEndStar.h
+-rw-r--r-- root/root usr/include/geos/geomgraph/EdgeList.h
+-rw-r--r-- root/root usr/include/geos/geomgraph/GeometryGraph.h
+-rw-r--r-- root/root usr/include/geos/geomgraph/GeometryGraph.inl
+-rw-r--r-- root/root usr/include/geos/geomgraph/GraphComponent.h
+-rw-r--r-- root/root usr/include/geos/geomgraph/Node.h
+-rw-r--r-- root/root usr/include/geos/geomgraph/NodeMap.h
+-rw-r--r-- root/root usr/include/geos/geomgraph/PlanarGraph.h
+drwxr-xr-x root/root usr/include/geos/geomgraph/index/
+-rw-r--r-- root/root usr/include/geos/geomgraph/index/EdgeSetIntersector.h
+-rw-r--r-- root/root usr/include/geos/geomgraph/index/MonotoneChain.h
+-rw-r--r-- root/root usr/include/geos/geomgraph/index/MonotoneChainEdge.h
+-rw-r--r-- root/root usr/include/geos/geomgraph/index/MonotoneChainIndexer.h
+-rw-r--r-- root/root usr/include/geos/geomgraph/index/SegmentIntersector.h
+-rw-r--r-- root/root usr/include/geos/geomgraph/index/SimpleEdgeSetIntersector.h
+-rw-r--r-- root/root usr/include/geos/geomgraph/index/SimpleMCSweepLineIntersector.h
+-rw-r--r-- root/root usr/include/geos/geomgraph/index/SimpleSweepLineIntersector.h
+-rw-r--r-- root/root usr/include/geos/geomgraph/index/SweepLineEvent.h
+-rw-r--r-- root/root usr/include/geos/geomgraph/index/SweepLineEventObj.h
+-rw-r--r-- root/root usr/include/geos/geomgraph/index/SweepLineSegment.h
+-rw-r--r-- root/root usr/include/geos/geomgraphindex.h
+-rw-r--r-- root/root usr/include/geos/geosAlgorithm.h
+drwxr-xr-x root/root usr/include/geos/index/
+-rw-r--r-- root/root usr/include/geos/index/ItemVisitor.h
+-rw-r--r-- root/root usr/include/geos/index/SpatialIndex.h
+drwxr-xr-x root/root usr/include/geos/index/bintree/
+-rw-r--r-- root/root usr/include/geos/index/bintree/Bintree.h
+-rw-r--r-- root/root usr/include/geos/index/bintree/Interval.h
+drwxr-xr-x root/root usr/include/geos/index/chain/
+-rw-r--r-- root/root usr/include/geos/index/chain/MonotoneChain.h
+-rw-r--r-- root/root usr/include/geos/index/chain/MonotoneChainOverlapAction.h
+-rw-r--r-- root/root usr/include/geos/index/chain/MonotoneChainSelectAction.h
+drwxr-xr-x root/root usr/include/geos/index/intervalrtree/
+drwxr-xr-x root/root usr/include/geos/index/quadtree/
+-rw-r--r-- root/root usr/include/geos/index/quadtree/NodeBase.h
+-rw-r--r-- root/root usr/include/geos/index/quadtree/Quadtree.h
+-rw-r--r-- root/root usr/include/geos/index/quadtree/Root.h
+drwxr-xr-x root/root usr/include/geos/index/strtree/
+-rw-r--r-- root/root usr/include/geos/index/strtree/AbstractNode.h
+-rw-r--r-- root/root usr/include/geos/index/strtree/AbstractSTRtree.h
+-rw-r--r-- root/root usr/include/geos/index/strtree/Boundable.h
+-rw-r--r-- root/root usr/include/geos/index/strtree/Interval.h
+-rw-r--r-- root/root usr/include/geos/index/strtree/SIRtree.h
+-rw-r--r-- root/root usr/include/geos/index/strtree/STRtree.h
+drwxr-xr-x root/root usr/include/geos/index/sweepline/
+-rw-r--r-- root/root usr/include/geos/index/sweepline/SweepLineOverlapAction.h
+-rw-r--r-- root/root usr/include/geos/indexBintree.h
+-rw-r--r-- root/root usr/include/geos/indexChain.h
+-rw-r--r-- root/root usr/include/geos/indexQuadtree.h
+-rw-r--r-- root/root usr/include/geos/indexStrtree.h
+-rw-r--r-- root/root usr/include/geos/indexSweepline.h
+-rw-r--r-- root/root usr/include/geos/inline.h
+-rw-r--r-- root/root usr/include/geos/io.h
+drwxr-xr-x root/root usr/include/geos/io/
+-rw-r--r-- root/root usr/include/geos/io/ByteOrderDataInStream.h
+-rw-r--r-- root/root usr/include/geos/io/ByteOrderDataInStream.inl
+-rw-r--r-- root/root usr/include/geos/io/ByteOrderValues.h
+-rw-r--r-- root/root usr/include/geos/io/CLocalizer.h
+-rw-r--r-- root/root usr/include/geos/io/ParseException.h
+-rw-r--r-- root/root usr/include/geos/io/WKBConstants.h
+-rw-r--r-- root/root usr/include/geos/io/WKBReader.h
+-rw-r--r-- root/root usr/include/geos/io/WKBWriter.h
+-rw-r--r-- root/root usr/include/geos/io/WKTReader.h
+-rw-r--r-- root/root usr/include/geos/io/WKTReader.inl
+-rw-r--r-- root/root usr/include/geos/io/WKTWriter.h
+-rw-r--r-- root/root usr/include/geos/noding.h
+-rw-r--r-- root/root usr/include/geos/nodingSnapround.h
+-rw-r--r-- root/root usr/include/geos/opBuffer.h
+-rw-r--r-- root/root usr/include/geos/opDistance.h
+-rw-r--r-- root/root usr/include/geos/opLinemerge.h
+-rw-r--r-- root/root usr/include/geos/opOverlay.h
+-rw-r--r-- root/root usr/include/geos/opPolygonize.h
+-rw-r--r-- root/root usr/include/geos/opPredicate.h
+-rw-r--r-- root/root usr/include/geos/opRelate.h
+-rw-r--r-- root/root usr/include/geos/opValid.h
+-rw-r--r-- root/root usr/include/geos/operation.h
+drwxr-xr-x root/root usr/include/geos/operation/
+-rw-r--r-- root/root usr/include/geos/operation/EndpointInfo.h
+-rw-r--r-- root/root usr/include/geos/operation/GeometryGraphOperation.h
+-rw-r--r-- root/root usr/include/geos/operation/IsSimpleOp.h
+drwxr-xr-x root/root usr/include/geos/operation/buffer/
+-rw-r--r-- root/root usr/include/geos/operation/buffer/BufferOp.h
+-rw-r--r-- root/root usr/include/geos/operation/buffer/OffsetCurveBuilder.h
+drwxr-xr-x root/root usr/include/geos/operation/distance/
+-rw-r--r-- root/root usr/include/geos/operation/distance/DistanceOp.h
+drwxr-xr-x root/root usr/include/geos/operation/linemerge/
+-rw-r--r-- root/root usr/include/geos/operation/linemerge/LineMergeGraph.h
+-rw-r--r-- root/root usr/include/geos/operation/linemerge/LineMerger.h
+drwxr-xr-x root/root usr/include/geos/operation/overlay/
+-rw-r--r-- root/root usr/include/geos/operation/overlay/OverlayOp.h
+drwxr-xr-x root/root usr/include/geos/operation/polygonize/
+-rw-r--r-- root/root usr/include/geos/operation/polygonize/Polygonizer.h
+drwxr-xr-x root/root usr/include/geos/operation/relate/
+-rw-r--r-- root/root usr/include/geos/operation/relate/RelateComputer.h
+-rw-r--r-- root/root usr/include/geos/operation/relate/RelateOp.h
+drwxr-xr-x root/root usr/include/geos/operation/union/
+-rw-r--r-- root/root usr/include/geos/operation/union/CascadedPolygonUnion.h
+drwxr-xr-x root/root usr/include/geos/operation/valid/
+-rw-r--r-- root/root usr/include/geos/operation/valid/IsValidOp.h
+-rw-r--r-- root/root usr/include/geos/operation/valid/TopologyValidationError.h
+-rw-r--r-- root/root usr/include/geos/planargraph.h
+drwxr-xr-x root/root usr/include/geos/planargraph/
+-rw-r--r-- root/root usr/include/geos/planargraph/NodeMap.h
+-rw-r--r-- root/root usr/include/geos/planargraph/PlanarGraph.h
+-rw-r--r-- root/root usr/include/geos/platform.h
+-rw-r--r-- root/root usr/include/geos/precision.h
+drwxr-xr-x root/root usr/include/geos/precision/
+-rw-r--r-- root/root usr/include/geos/precision/CommonBitsOp.h
+-rw-r--r-- root/root usr/include/geos/precision/CommonBitsRemover.h
+-rw-r--r-- root/root usr/include/geos/precision/EnhancedPrecisionOp.h
+-rw-r--r-- root/root usr/include/geos/precision/GeometrySnapper.h
+-rw-r--r-- root/root usr/include/geos/precision/SimpleGeometryPrecisionReducer.h
+drwxr-xr-x root/root usr/include/geos/simplify/
+-rw-r--r-- root/root usr/include/geos/simplify/DouglasPeuckerSimplifier.h
+-rw-r--r-- root/root usr/include/geos/simplify/TopologyPreservingSimplifier.h
+-rw-r--r-- root/root usr/include/geos/spatialIndex.h
+-rw-r--r-- root/root usr/include/geos/timeval.h
+-rw-r--r-- root/root usr/include/geos/unload.h
+-rw-r--r-- root/root usr/include/geos/util.h
+drwxr-xr-x root/root usr/include/geos/util/
+-rw-r--r-- root/root usr/include/geos/util/GEOSException.h
+-rw-r--r-- root/root usr/include/geos/util/GeometricShapeFactory.h
+-rw-r--r-- root/root usr/include/geos/util/IllegalArgumentException.h
+-rw-r--r-- root/root usr/include/geos/util/TopologyException.h
+-rw-r--r-- root/root usr/include/geos/version.h
+-rw-r--r-- root/root usr/include/geos_c.h
+drwxr-xr-x root/root usr/lib/
+-rwxr-xr-x root/root usr/lib/libgeos-3.1.1.so
+-rw-r--r-- root/root usr/lib/libgeos.a
+-rwxr-xr-x root/root usr/lib/libgeos.la
+lrwxrwxrwx root/root usr/lib/libgeos.so -> libgeos-3.1.1.so
+lrwxrwxrwx root/root usr/lib/libgeos.so.2 -> /usr/lib/libgeos.so
+-rw-r--r-- root/root usr/lib/libgeos_c.a
+-rwxr-xr-x root/root usr/lib/libgeos_c.la
+lrwxrwxrwx root/root usr/lib/libgeos_c.so -> libgeos_c.so.1.6.0
+lrwxrwxrwx root/root usr/lib/libgeos_c.so.1 -> libgeos_c.so.1.6.0
+-rwxr-xr-x root/root usr/lib/libgeos_c.so.1.6.0
diff --git a/extra/geos/.md5sum b/extra/geos/.md5sum
new file mode 100644
index 000000000..6fe406d6d
--- /dev/null
+++ b/extra/geos/.md5sum
@@ -0,0 +1,2 @@
+01e268177a673704eba3def8c9efdf88 gcc4.3.patch
+196f4424aa4ef94476e6886d3a964fb6 geos-3.1.1.tar.bz2
diff --git a/extra/geos/Pkgfile b/extra/geos/Pkgfile
new file mode 100644
index 000000000..2918793cb
--- /dev/null
+++ b/extra/geos/Pkgfile
@@ -0,0 +1,22 @@
+# Description: A C++ port of the Java Topology Suite
+# URL: http://geos.refractions.net
+# Maintainer: NuTyX core team
+# Packager: lesibel at free dot fr
+# Depends on:
+
+name=geos
+version=3.1.1
+release=1
+source=(http://download.osgeo.org/$name/$name-$version.tar.bz2 \
+ gcc4.3.patch )
+
+build() {
+ cd $name-$version
+
+ ./configure --prefix=/usr
+# patch -Np1 < ../gcc4.3.patch
+ make
+ make DESTDIR=$PKG install
+
+ ln -s /usr/lib/libgeos.so $PKG/usr/lib/libgeos.so.2
+}
diff --git a/extra/geos/gcc4.3.patch b/extra/geos/gcc4.3.patch
new file mode 100644
index 000000000..47b7b0d12
--- /dev/null
+++ b/extra/geos/gcc4.3.patch
@@ -0,0 +1,141 @@
+--- geos-3.0.0/source/planargraph/DirectedEdge.cpp~
++++ geos-3.0.0/source/planargraph/DirectedEdge.cpp
+@@ -21,6 +21,7 @@
+ #include <cmath>
+ #include <sstream>
+ #include <vector>
++#include <typeinfo>
+
+ using namespace std;
+ using namespace geos::geom;
+--- geos-3.0.0/source/precision/SimpleGeometryPrecisionReducer.cpp~
++++ geos-3.0.0/source/precision/SimpleGeometryPrecisionReducer.cpp
+@@ -30,6 +30,7 @@
+ #include <geos/geom/LinearRing.h>
+
+ #include <vector>
++#include <typeinfo>
+
+ using namespace std;
+ using namespace geos::geom;
+--- geos-3.0.0/source/io/ByteOrderValues.cpp~
++++ geos-3.0.0/source/io/ByteOrderValues.cpp
+@@ -22,6 +22,7 @@
+ #include <geos/util.h>
+
+ #include <cassert>
++#include <cstring>
+
+ namespace geos {
+ namespace io { // geos.io
+--- geos-3.0.0/source/io/StringTokenizer.cpp~
++++ geos-3.0.0/source/io/StringTokenizer.cpp
+@@ -17,6 +17,7 @@
+ #include <geos/io/StringTokenizer.h>
+
+ #include <string>
++#include <cstdlib>
+
+ using namespace std;
+
+--- geos-3.0.0/source/operation/buffer/OffsetCurveSetBuilder.cpp~
++++ geos-3.0.0/source/operation/buffer/OffsetCurveSetBuilder.cpp
+@@ -41,6 +41,7 @@
+ #include <vector>
+ #include <memory>
+ #include <cassert>
++#include <typeinfo>
+
+ #ifndef GEOS_DEBUG
+ #define GEOS_DEBUG 0
+--- geos-3.0.0/source/operation/distance/ConnectedElementPointFilter.cpp~
++++ geos-3.0.0/source/operation/distance/ConnectedElementPointFilter.cpp
+@@ -20,6 +20,7 @@
+ #include <geos/geom/Polygon.h>
+
+ #include <vector>
++#include <typeinfo>
+
+ using namespace std;
+ using namespace geos::geom;
+--- geos-3.0.0/source/geomgraph/GeometryGraph.cpp~
++++ geos-3.0.0/source/geomgraph/GeometryGraph.cpp
+@@ -45,6 +45,7 @@
+ #include <vector>
+ #include <memory> // auto_ptr
+ #include <cassert>
++#include <typeinfo>
+
+ #ifndef GEOS_DEBUG
+ #define GEOS_DEBUG 0
+--- geos-3.0.0/source/index/quadtree/DoubleBits.cpp~
++++ geos-3.0.0/source/index/quadtree/DoubleBits.cpp
+@@ -22,6 +22,7 @@
+ #include <geos/util/IllegalArgumentException.h>
+
+ #include <string>
++#include <cstring>
+
+ #if __STDC_IEC_559__
+ #define ASSUME_IEEE_DOUBLE 1
+--- geos-3.0.0/source/headers/geos/noding/FastNodingValidator.h~
++++ geos-3.0.0/source/headers/geos/noding/FastNodingValidator.h
+@@ -25,6 +25,7 @@
+
+ #include <cassert>
+ #include <string>
++#include <memory>
+
+ // Forward declarations
+ namespace geos {
+--- geos-3.0.0.orig/source/headers/geos/noding/IntersectionAdder.h
++++ geos-3.0.0/source/headers/geos/noding/IntersectionAdder.h
+@@ -19,6 +19,7 @@
+ #include <vector>
+ #include <iostream>
+ #include <cmath> // for abs()
++#include <cstdlib> // for abs()
+
+ #include <geos/inline.h>
+
+--- geos-3.0.0.orig/doc/example.cpp
++++ geos-3.0.0/doc/example.cpp
+@@ -31,6 +31,7 @@
+ #include <vector>
+ #include <sstream>
+ #include <iomanip>
++#include <cstdlib>
+ #include <geos/geom/PrecisionModel.h>
+ #include <geos/geom/GeometryFactory.h>
+ #include <geos/geom/Geometry.h>
+--- geos-3.0.0.orig/tests/xmltester/markup/MarkupSTL.h
++++ geos-3.0.0/tests/xmltester/markup/MarkupSTL.h
+@@ -65,6 +65,7 @@
+ #include <string>
+ #include <map>
+ #include <vector>
++#include <cstring>
+
+ #ifdef _DEBUG
+ #define _DS(i) (i?&(m_strDoc.c_str())[m_aPos[i].nStartL]:0)
+--- geos-3.0.0.orig/tests/xmltester/XMLTester.cpp
++++ geos-3.0.0/tests/xmltester/XMLTester.cpp
+@@ -57,6 +57,7 @@
+ #include <functional>
+ #include <stdexcept>
+ #include <cmath>
++#include <cstring>
+
+ #ifdef _MSC_VER
+ #include <windows.h>
+--- geos-3.0.0.orig/tests/bigtest/TestSweepLineSpeed.cpp
++++ geos-3.0.0/tests/bigtest/TestSweepLineSpeed.cpp
+@@ -88,7 +88,7 @@
+ // cout << "n Pts: " << nPts << " Executed in " << totalTime << endl;
+ }
+
+-int main(int /* argC */, char* /* argV[] */) {
++int main(int /* argC */, char** /* argV */) {
+
+ GeometryFactory *fact=new GeometryFactory();
+