Skip to content

Commit 977ada1

Browse files
author
jef
committed
fix r9655
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9656 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent d4582ca commit 977ada1

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/providers/grass/qgsgrassprovider.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -1040,7 +1040,8 @@ int QgsGrassProvider::openMap( QString gisdbase, QString location, QString mapse
10401040
if ( level == 1 )
10411041
{
10421042
QgsGrass::resetError();
1043-
#if GRASS_VERSION_MAJOR >= 6 && GRASS_VERSION_MINOR >= 4
1043+
#if defined(GRASS_VERSION_MAJOR) && defined(GRASS_VERSION_MINOR) && \
1044+
( ( GRASS_VERSION_MAJOR == 6 && GRASS_VERSION_MINOR >= 4 ) || GRASS_VERSION_MAJOR > 6 )
10441045
Vect_build( map.map );
10451046
#else
10461047
Vect_build( map.map, stderr );
@@ -1524,7 +1525,8 @@ bool QgsGrassProvider::closeEdit( bool newMap )
15241525
G__setenv(( char * ) "MAPSET", map->mapset.toAscii().data() );
15251526

15261527
Vect_build_partial( map->map, GV_BUILD_NONE, NULL );
1527-
#if GRASS_VERSION_MAJOR >= 6 && GRASS_VERSION_MINOR >= 4
1528+
#if defined(GRASS_VERSION_MAJOR) && defined(GRASS_VERSION_MINOR) && \
1529+
( ( GRASS_VERSION_MAJOR == 6 && GRASS_VERSION_MINOR >= 4 ) || GRASS_VERSION_MAJOR > 6 )
15281530
Vect_build( map.map );
15291531
#else
15301532
Vect_build( map->map, stderr );

0 commit comments

Comments
 (0)