fix r9655

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9656 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Nov 17, 2008 · 977ada1 · 977ada1
1 parent d4582ca
commit 977ada1
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/providers/grass/qgsgrassprovider.cpp b/src/providers/grass/qgsgrassprovider.cpp
@@ -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 );