[QGIS Commit] r9656 - trunk/qgis/src/providers/grass

[svn_qgis at osgeo.org]

Author: jef
Date: 2008-11-17 12:03:56 -0500 (Mon, 17 Nov 2008)
New Revision: 9656

Modified:
   trunk/qgis/src/providers/grass/qgsgrassprovider.cpp
Log:
fix r9655

Modified: trunk/qgis/src/providers/grass/qgsgrassprovider.cpp
===================================================================
--- trunk/qgis/src/providers/grass/qgsgrassprovider.cpp	2008-11-17 16:29:34 UTC (rev 9655)
+++ trunk/qgis/src/providers/grass/qgsgrassprovider.cpp	2008-11-17 17:03:56 UTC (rev 9656)
@@ -1040,7 +1040,8 @@
   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 @@
   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 );