? capi/geos_c.cpp.last
? source/geos.dll.manifest
Index: source/geomgraph/index/SweepLineEvent.cpp
===================================================================
RCS file: /home/cvs/postgis/geos/source/geomgraph/index/SweepLineEvent.cpp,v
retrieving revision 1.7
diff -U2 -r1.7 SweepLineEvent.cpp
--- source/geomgraph/index/SweepLineEvent.cpp	19 Feb 2006 19:46:49 -0000	1.7
+++ source/geomgraph/index/SweepLineEvent.cpp	2 Mar 2006 14:05:13 -0000
@@ -30,10 +30,10 @@
 		deleteEventIndex(0)
 {
-	if(insertEvent!=NULL) eventType=DELETE;
-	else eventType=INSERT;
+	if(insertEvent!=NULL) eventType=DELETE_EVENT;
+	else eventType=INSERT_EVENT;
 }
 
 SweepLineEvent::~SweepLineEvent(){
-	if (eventType==DELETE) {
+	if (eventType==DELETE_EVENT) {
 		delete insertEvent;
 		delete obj; 
@@ -65,5 +65,5 @@
 	s<<"SweepLineEvent:";
 	s<<" xValue="<<xValue<<" deleteEventIndex="<<deleteEventIndex;
-	s<<( (eventType==INSERT) ? " INSERT" : " DELETE" );
+	s<<( (eventType==INSERT_EVENT) ? " INSERT_EVENT" : " DELETE_EVENT" );
 	s<<endl<<"\tinsertEvent=";
 	if (insertEvent) s<<insertEvent->print();
Index: source/headers/geos/geomgraphindex.h
===================================================================
RCS file: /home/cvs/postgis/geos/source/headers/geos/geomgraphindex.h,v
retrieving revision 1.9
diff -U2 -r1.9 geomgraphindex.h
--- source/headers/geos/geomgraphindex.h	23 Feb 2006 11:54:20 -0000	1.9
+++ source/headers/geos/geomgraphindex.h	2 Mar 2006 14:05:13 -0000
@@ -169,6 +169,6 @@
 public:
 	enum {
-		INSERT=1,
-		DELETE
+		INSERT_EVENT = 1,
+		DELETE_EVENT
 	};
 	SweepLineEvent(void* newEdgeSet,double x,SweepLineEvent *newInsertEvent,SweepLineEventOBJ *newObj);
@@ -190,5 +190,5 @@
 	double xValue;
 	int eventType;
-	SweepLineEvent *insertEvent; // null if this is an INSERT event
+	SweepLineEvent *insertEvent; // null if this is an INSERT_EVENT event
 	int deleteEventIndex;
 };
Index: source/headers/geos/indexSweepline.h
===================================================================
RCS file: /home/cvs/postgis/geos/source/headers/geos/indexSweepline.h,v
retrieving revision 1.4
diff -U2 -r1.4 indexSweepline.h
--- source/headers/geos/indexSweepline.h	23 Feb 2006 23:17:52 -0000	1.4
+++ source/headers/geos/indexSweepline.h	2 Mar 2006 14:05:13 -0000
@@ -60,6 +60,6 @@
 public:
 	enum {
-		INSERT = 1,
-		DELETE
+		INSERT_EVENT = 1,
+		DELETE_EVENT
 	};
 	indexSweepLineEvent(double x,indexSweepLineEvent *newInsertEvent,SweepLineInterval *newSweepInt);
@@ -81,5 +81,5 @@
 	double xValue;
 	int eventType;
-	indexSweepLineEvent *insertEvent; // null if this is an INSERT event
+	indexSweepLineEvent *insertEvent; // null if this is an INSERT_EVENT event
 	int deleteEventIndex;
 	SweepLineInterval *sweepInt;
Index: source/index/sweepline/indexSweepLineEvent.cpp
===================================================================
RCS file: /home/cvs/postgis/geos/source/index/sweepline/indexSweepLineEvent.cpp,v
retrieving revision 1.7
diff -U2 -r1.7 indexSweepLineEvent.cpp
--- source/index/sweepline/indexSweepLineEvent.cpp	20 Feb 2006 10:14:18 -0000	1.7
+++ source/index/sweepline/indexSweepLineEvent.cpp	2 Mar 2006 14:05:13 -0000
@@ -25,7 +25,7 @@
 	xValue = x;
 	insertEvent=newInsertEvent;
-	eventType=indexSweepLineEvent::INSERT;
+	eventType=indexSweepLineEvent::INSERT_EVENT;
 	if (insertEvent!=NULL)
-		eventType=indexSweepLineEvent::DELETE;
+		eventType=indexSweepLineEvent::DELETE_EVENT;
 	sweepInt=newSweepInt;
 }