Blob Blame History Raw
diff -up geos-2.2.3/source/headers/geos/io.h.BAD geos-2.2.3/source/headers/geos/io.h
--- geos-2.2.3/source/headers/geos/io.h.BAD	2008-06-06 11:19:15.000000000 -0500
+++ geos-2.2.3/source/headers/geos/io.h	2008-06-06 11:19:18.000000000 -0500
@@ -19,7 +19,7 @@
 
 #include <memory>
 #include <iostream>
-#include <string>
+#include <cstring>
 #include <geos/platform.h>
 #include <geos/geom.h>
 #include <geos/util.h>
diff -up geos-2.2.3/source/headers/geos/util.h.BAD geos-2.2.3/source/headers/geos/util.h
--- geos-2.2.3/source/headers/geos/util.h.BAD	2008-06-06 11:19:42.000000000 -0500
+++ geos-2.2.3/source/headers/geos/util.h	2008-06-06 11:19:47.000000000 -0500
@@ -17,7 +17,7 @@
 #define GEOS_UTIL_H
 
 #include <memory>
-#include <string>
+#include <cstring>
 #include <geos/platform.h>
 #include <geos/geom.h>
 
diff -up geos-2.2.3/source/io/markup/MarkupSTL.cpp.BAD geos-2.2.3/source/io/markup/MarkupSTL.cpp
--- geos-2.2.3/source/io/markup/MarkupSTL.cpp.BAD	2008-06-06 11:30:08.000000000 -0500
+++ geos-2.2.3/source/io/markup/MarkupSTL.cpp	2008-06-06 11:40:18.000000000 -0500
@@ -6,6 +6,7 @@
 // Use in commercial applications requires written permission
 // This software is provided "as is", with no warranty.
 
+#include <string.h>
 #include "MarkupSTL.h"
 #include <stdio.h>
 
diff -up geos-2.2.3/source/io/markup/MarkupSTL.h.BAD geos-2.2.3/source/io/markup/MarkupSTL.h
--- geos-2.2.3/source/io/markup/MarkupSTL.h.BAD	2008-06-06 11:29:05.000000000 -0500
+++ geos-2.2.3/source/io/markup/MarkupSTL.h	2008-06-06 11:38:20.000000000 -0500
@@ -38,6 +38,8 @@
 #include <map>
 #include <vector>
 
+using namespace std;
+
 #ifdef _DEBUG
 #define _DS(i) (i?&(m_strDoc.c_str())[m_aPos[i].nStartL]:0)
 #define MARKUP_SETDEBUGSTATE m_pMainDS=_DS(m_iPos); m_pChildDS=_DS(m_iPosChild)