Correct previous commit for older PostgreSQL versions - the order of the methods...

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

diff --git a/loader/shp2pgsql.c b/loader/shp2pgsql.c
index 1c5859ab093c55695c085f043c258c9c88729a54..7be8e4850869c3139f144a79e8a1de6f193a89a2 100644 (file)
--- a/loader/shp2pgsql.c
+++ b/loader/shp2pgsql.c
@@ -251,7 +251,8 @@ protect_quotes_string(char *str)
        optr=result;
        ptr=str;
        while (*ptr) {
-               if ( *ptr == '\'' || *ptr == '\\' ) *optr++='\\';
+               if ( *ptr == '\'' ) *optr++='\'';
+        else if ( *ptr == '\\' ) *optr++='\\';
                *optr++=*ptr++;
        }
        *optr='\0';

diff --git a/lwgeom/lwgeom_transform.c b/lwgeom/lwgeom_transform.c
index 77f356fe37525a3d15ca6d5e16a8aaa117d8ae57..34de0a4dd1781cd0c674963b04e191833c8d3936 100644 (file)
--- a/lwgeom/lwgeom_transform.c
+++ b/lwgeom/lwgeom_transform.c
@@ -160,10 +160,11 @@ static MemoryContextMethods PROJ4SRSCacheContextMethods = {
        NULL,
        PROJ4SRSCacheInit,
        PROJ4SRSCacheReset,
-       PROJ4SRSCacheDelete
+       PROJ4SRSCacheDelete,
 #ifdef MEMORY_CONTEXT_CHECKING
-       ,PROJ4SRSCacheCheck
+       PROJ4SRSCacheCheck,
 #endif
+    PROJ4SRSCacheStats
 };
 #endif
 
@@ -176,7 +177,7 @@ static MemoryContextMethods PROJ4SRSCacheContextMethods = {
        PROJ4SRSCacheReset,
        PROJ4SRSCacheDelete,
        NULL,
-       PROJ4SRSCacheIsEmpty
+       PROJ4SRSCacheStats
 #ifdef MEMORY_CONTEXT_CHECKING
        ,PROJ4SRSCacheCheck
 #endif
@@ -310,7 +311,7 @@ static HTAB *CreatePJHash(void)
        ctl.entrysize = sizeof(PJHashEntry);
        ctl.hash = mcxt_ptr_hash;
 
-       return hash_create("PROJ4 Backend PJ MemoryContext Hash", PROJ4_BACKEND_HASH_SIZE, &ctl, (HASH_ELEM | HASH_FUNCTION));
+       return hash_create("PostGIS PROJ4 Backend PJ MemoryContext Hash", PROJ4_BACKEND_HASH_SIZE, &ctl, (HASH_ELEM | HASH_FUNCTION));
 }
 
 static void AddPJHashEntry(MemoryContext mcxt, PJ *projection)