From db88832953aa1548b4c730c8619e2b299429cdb7 Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 28 Oct 2004 16:23:17 +0000
Subject: [PATCH] More cleanups.

git-svn-id: http://svn.osgeo.org/postgis/trunk@1066 b70326c6-7e19-0410-871a-916f4a2858ee
---
 lwgeom/Makefile                | 7 +++++++
 lwgeom/lwgeom_geos_wrapper.cpp | 2 +-
 lwgeom/lwgeom_gml.c            | 6 +++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/lwgeom/Makefile b/lwgeom/Makefile
index 7d8319d16..33622121d 100644
--- a/lwgeom/Makefile
+++ b/lwgeom/Makefile
@@ -11,6 +11,13 @@ ifeq ($(CXX),)
 	CXX = c++
 endif
 
+#---------------------------------------------------------------
+# Default missing YACC variable to c++
+# 
+ifeq ($(YACC),) 
+	YACC = yacc
+endif
+
 #---------------------------------------------------------------
 # Shared library parameters.
 #
diff --git a/lwgeom/lwgeom_geos_wrapper.cpp b/lwgeom/lwgeom_geos_wrapper.cpp
index dba7388db..7a7ff07e8 100644
--- a/lwgeom/lwgeom_geos_wrapper.cpp
+++ b/lwgeom/lwgeom_geos_wrapper.cpp
@@ -380,11 +380,11 @@ Geometry *PostGIS2GEOS_polygon(const LWPOLY *lwpoly)
 		CoordinateSequence *cl;
 		POINT3D *p;
 		vector<Geometry *> *innerRings;
-		vector<Coordinate> *vc;
 
 		// make outerRing
 		pa = lwpoly->rings[0];
 #if GEOS_LAST_INTERFACE >= 2
+		vector<Coordinate> *vc;
 		vc = new vector<Coordinate>(pa->npoints);
 #else
 		cl = new DefaultCoordinateSequence(pa->npoints);
diff --git a/lwgeom/lwgeom_gml.c b/lwgeom/lwgeom_gml.c
index f949f967b..32c0f15a6 100644
--- a/lwgeom/lwgeom_gml.c
+++ b/lwgeom/lwgeom_gml.c
@@ -55,10 +55,11 @@ Datum LWGEOM_asGML(PG_FUNCTION_ARGS)
 	char *result;
 	int len;
 	int version = 2;
-	int precision = DEF_PRECISION;
 	char *srs;
 	int SRID;
 
+	precision = DEF_PRECISION;
+
 	if ( PG_ARGISNULL(0) ) PG_RETURN_NULL();
 
 	geom = (PG_LWGEOM *)PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
@@ -502,6 +503,9 @@ getSRSbySRID(int SRID)
 
 /**********************************************************************
  * $Log$
+ * Revision 1.7  2004/10/28 16:23:17  strk
+ * More cleanups.
+ *
  * Revision 1.6  2004/10/28 16:10:25  strk
  * Fixed a bug in LWGEOM_asGML.
  *
-- 
2.40.0