Fixed prototype of linemerge() and error typo in it

git-svn-id: http://svn.osgeo.org/postgis/trunk@1931 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/lwgeom/lwgeom_geos.c b/lwgeom/lwgeom_geos.c
index 7604b4ea990832bfb7851c7dfbd0f4eb574bce02..a3a86df9d2359b5792a9aa7615532c4182793efc 100644 (file)
--- a/lwgeom/lwgeom_geos.c
+++ b/lwgeom/lwgeom_geos.c
@@ -49,7 +49,7 @@ Datum postgis_geos_version(PG_FUNCTION_ARGS);
 Datum postgis_jts_version(PG_FUNCTION_ARGS);
 Datum centroid(PG_FUNCTION_ARGS);
 Datum polygonize_garray(PG_FUNCTION_ARGS);
-Datum linemerge_garray(PG_FUNCTION_ARGS);
+Datum linemerge(PG_FUNCTION_ARGS);
 
 
 
@@ -2720,7 +2720,7 @@ Datum linemerge(PG_FUNCTION_ARGS)
        {
                GEOSdeleteGeometry(g1);
                GEOSdeleteGeometry(g3);
-               elog(ERROR,"GEOS buffer() threw an error (result postgis geometry formation)!");
+               elog(ERROR,"GEOS LineMerge() threw an error (result postgis geometry formation)!");
                PG_RETURN_NULL(); //never get here
        }
        GEOSdeleteGeometry(g1);