fix r9655

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9656 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
jef 2008-11-17 17:03:56 +00:00
parent d4582ca196
commit 977ada1399

View File

@ -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 );
@ -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 );