From: Sandro Santilli Date: Thu, 19 Aug 2004 13:54:15 +0000 (+0000) Subject: cpp checks updated to use 80 instead of 75 for USE_VERSION X-Git-Tag: pgis_0_9_1~96 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a48fbb12a509b6cade34daa80ab855ed6e53fa23;p=postgis cpp checks updated to use 80 instead of 75 for USE_VERSION git-svn-id: http://svn.osgeo.org/postgis/trunk@698 b70326c6-7e19-0410-871a-916f4a2858ee --- diff --git a/lwgeom/lwgeom_estimate.c b/lwgeom/lwgeom_estimate.c index c88cff7d9..0db57e823 100644 --- a/lwgeom/lwgeom_estimate.c +++ b/lwgeom/lwgeom_estimate.c @@ -10,6 +10,9 @@ * ********************************************************************** * $Log$ + * Revision 1.3 2004/08/19 13:54:15 strk + * cpp checks updated to use 80 instead of 75 for USE_VERSION + * * Revision 1.2 2004/08/19 13:18:01 strk * Added selectivity estimation * @@ -31,7 +34,7 @@ #include "lwgeom.h" -#if USE_VERSION >= 75 +#if USE_VERSION >= 80 #include "commands/vacuum.h" #include "utils/lsyscache.h" @@ -120,7 +123,7 @@ Datum build_lwhistogram2d(PG_FUNCTION_ARGS); Datum explode_lwhistogram2d(PG_FUNCTION_ARGS); Datum estimate_lwhistogram2d(PG_FUNCTION_ARGS); Datum lwgeom_gist_sel(PG_FUNCTION_ARGS); -#if USE_VERSION >= 75 +#if USE_VERSION >= 80 Datum lwgeom_analyze(PG_FUNCTION_ARGS); #endif @@ -714,7 +717,7 @@ Datum estimate_lwhistogram2d(PG_FUNCTION_ARGS) /**************************** FROM POSTGIS ****************/ -#if USE_VERSION < 75 +#if USE_VERSION < 80 /* * get_restriction_var * Examine the args of a restriction clause to see if it's of the @@ -907,7 +910,7 @@ Datum lwgeom_gist_sel(PG_FUNCTION_ARGS) PG_RETURN_FLOAT8(myest); } -#else // USE_VERSION >= 75 +#else // USE_VERSION >= 80 /* * This function returns an estimate of the selectivity diff --git a/lwgeom/lwpostgis.sql.in b/lwgeom/lwpostgis.sql.in index 42486a329..226237a69 100644 --- a/lwgeom/lwpostgis.sql.in +++ b/lwgeom/lwpostgis.sql.in @@ -11,8 +11,8 @@ -- -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- $Log$ --- Revision 1.1 2004/08/19 13:49:29 strk --- initial import +-- Revision 1.2 2004/08/19 13:54:15 strk +-- cpp checks updated to use 80 instead of 75 for USE_VERSION -- -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -68,7 +68,7 @@ CREATEFUNCTION geometry_out(geometry) AS '@MODULE_FILENAME@','LWGEOM_out' LANGUAGE 'C' WITH (isstrict,iscachable); -#if USE_VERSION >= 75 +#if USE_VERSION >= 80 CREATEFUNCTION geometry_analyze(internal) RETURNS bool AS '@MODULE_FILENAME@', 'lwgeom_analyze' @@ -907,7 +907,7 @@ CREATE TABLE geometry_columns ( coord_dimension integer not null, srid integer not null, type varchar(30) not null, -#if USE_VERSION < 75 +#if USE_VERSION < 80 attrelid oid, varattnum int, stats histogram2d, @@ -1011,7 +1011,7 @@ BEGIN GET DIAGNOSTICS foundschema = ROW_COUNT; #endif -#if USE_VERSION >= 75 +#if USE_VERSION >= 80 -- no linkage to system table needed return ''fixed:''||foundschema::text; #endif @@ -1119,7 +1119,7 @@ BEGIN strpos(typecheck.consrc, ''::'')- strpos(typecheck.consrc, ''='') ))::varchar as type, -#if USE_VERSION < 75 +#if USE_VERSION < 80 a.attrelid, a.attnum as varattnum, null::histogram2d as stats @@ -1578,10 +1578,10 @@ LANGUAGE 'sql' WITH (isstrict); -- It is defined also for PG>=75 for back-compatibility -- ----------------------------------------------------------------------- -#if USE_VERSION >= 75 +#if USE_VERSION >= 80 CREATEFUNCTION update_geometry_stats() RETURNS text AS ' SELECT ''update_geometry_stats() has been obsoleted. Statistics are automatically built running the ANALYZE command''::text' LANGUAGE 'sql'; -#else // USE_VERSION < 75 +#else // USE_VERSION < 80 CREATEFUNCTION update_geometry_stats() RETURNS text AS @@ -1621,7 +1621,7 @@ BEGIN END; ' LANGUAGE 'plpgsql' ; -#endif // USE_VERSION < 75 +#endif // USE_VERSION < 80 ----------------------------------------------------------------------- -- UPDATE_GEOMETRY_STATS( , ) @@ -1634,7 +1634,7 @@ LANGUAGE 'plpgsql' ; -- It is defined also for PG>=75 for back-compatibility -- ----------------------------------------------------------------------- -#if USE_VERSION >= 75 +#if USE_VERSION >= 80 CREATEFUNCTION update_geometry_stats(varchar,varchar) RETURNS text AS 'SELECT update_geometry_stats();' LANGUAGE 'sql' ; #else @@ -1687,7 +1687,7 @@ END; ' LANGUAGE 'plpgsql' ; -#endif // USE_VERSION < 75 +#endif // USE_VERSION < 80 ----------------------------------------------------------------------- -- FIND_SRID( ,
, )