[gdal-grass] 02/07: Imported Upstream version 1.11.2

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch experimental
in repository gdal-grass.

commit 6ceebc9620d7462fa11e4d8e92207d22d7431ef4
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Feb 18 00:02:19 2015 +0100

    Imported Upstream version 1.11.2
---
 VERSION                | 2 +-
 grass57dataset.cpp     | 5 +++--
 ogrgrassdatasource.cpp | 8 ++++++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/VERSION b/VERSION
index 720c738..ca71766 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.11.1
+1.11.2
diff --git a/grass57dataset.cpp b/grass57dataset.cpp
index 06a142f..0e1d620 100644
--- a/grass57dataset.cpp
+++ b/grass57dataset.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************
- * $Id: grass57dataset.cpp 27044 2014-03-16 23:41:27Z rouault $
+ * $Id: grass57dataset.cpp 28291 2015-01-05 14:45:07Z martinl $
  *
  * Project:  GRASS Driver
  * Purpose:  Implement GRASS raster read/write support
@@ -63,7 +63,7 @@ char *GPJ_grass_to_wkt(struct Key_Value *,
 
 #define GRASS_MAX_COLORS 100000  // what is the right value
 
-CPL_CVSID("$Id: grass57dataset.cpp 27044 2014-03-16 23:41:27Z rouault $");
+CPL_CVSID("$Id: grass57dataset.cpp 28291 2015-01-05 14:45:07Z martinl $");
 
 CPL_C_START
 void	GDALRegister_GRASS(void);
@@ -92,6 +92,7 @@ CPL_C_END
 #define G_get_d_raster_row       Rast_get_d_row
 #define G_allocate_f_raster_buf  Rast_allocate_f_buf
 #define G_allocate_d_raster_buf  Rast_allocate_d_buf
+#define G__setenv                G_setenv_nogisrc
 #endif
 
 /************************************************************************/
diff --git a/ogrgrassdatasource.cpp b/ogrgrassdatasource.cpp
index 9298c45..c95ce7e 100644
--- a/ogrgrassdatasource.cpp
+++ b/ogrgrassdatasource.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************
- * $Id: ogrgrassdatasource.cpp 27044 2014-03-16 23:41:27Z rouault $
+ * $Id: ogrgrassdatasource.cpp 28291 2015-01-05 14:45:07Z martinl $
  *
  * Project:  OpenGIS Simple Features Reference Implementation
  * Purpose:  Implements OGRGRASSDataSource class.
@@ -32,7 +32,11 @@
 #include "cpl_conv.h"
 #include "cpl_string.h"
 
-CPL_CVSID("$Id: ogrgrassdatasource.cpp 27044 2014-03-16 23:41:27Z rouault $");
+CPL_CVSID("$Id: ogrgrassdatasource.cpp 28291 2015-01-05 14:45:07Z martinl $");
+
+#if GRASS_VERSION_MAJOR  >= 7
+#define G__setenv                G_setenv_nogisrc
+#endif
 
 /************************************************************************/
 /*                         Grass2CPLErrorHook()                         */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal-grass.git