Skip to content

Commit

Permalink
fix r9655
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk@9656 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Nov 17, 2008
1 parent a81a455 commit de7f366
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/providers/grass/qgsgrassprovider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1040,7 +1040,8 @@ int QgsGrassProvider::openMap( QString gisdbase, QString location, QString mapse
if ( level == 1 )
{
QgsGrass::resetError();
#if GRASS_VERSION_MAJOR >= 6 && GRASS_VERSION_MINOR >= 4
#if defined(GRASS_VERSION_MAJOR) && defined(GRASS_VERSION_MINOR) && \
( ( GRASS_VERSION_MAJOR == 6 && GRASS_VERSION_MINOR >= 4 ) || GRASS_VERSION_MAJOR > 6 )
Vect_build( map.map );
#else
Vect_build( map.map, stderr );
Expand Down Expand Up @@ -1524,7 +1525,8 @@ bool QgsGrassProvider::closeEdit( bool newMap )
G__setenv(( char * ) "MAPSET", map->mapset.toAscii().data() );

Vect_build_partial( map->map, GV_BUILD_NONE, NULL );
#if GRASS_VERSION_MAJOR >= 6 && GRASS_VERSION_MINOR >= 4
#if defined(GRASS_VERSION_MAJOR) && defined(GRASS_VERSION_MINOR) && \
( ( GRASS_VERSION_MAJOR == 6 && GRASS_VERSION_MINOR >= 4 ) || GRASS_VERSION_MAJOR > 6 )
Vect_build( map.map );
#else
Vect_build( map->map, stderr );
Expand Down

0 comments on commit de7f366

Please sign in to comment.