grass 6.4 fix

jef · jef · commit 1e9b573ccadf · 2008-11-29T21:25:34.000Z
git-svn-id: http://svn.osgeo.org/qgis/branches/Release-0_11_0@9720 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/plugins/grass/qgsgrassplugin.cpp b/src/plugins/grass/qgsgrassplugin.cpp
@@ -52,6 +52,7 @@
 extern "C" {
 #include <grass/gis.h>
 #include <grass/Vect.h>
+#include <grass/version.h>
 }
 
 #include "qgsgrassplugin.h"
@@ -496,7 +497,7 @@ void QgsGrassPlugin::newVector()
     return;
   }
 
-#if defined(GRASS_VERSION_MAJOR) && defined(GRASS_VERSION_MINOR) && \ 
+#if defined(GRASS_VERSION_MAJOR) && defined(GRASS_VERSION_MINOR) && \
     ( ( GRASS_VERSION_MAJOR == 6 && GRASS_VERSION_MINOR >= 4 ) || GRASS_VERSION_MAJOR > 6 )
   Vect_build ( &Map );
 #else

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@`
`52`	`52`	`extern "C" {`
`53`	`53`	`#include <grass/gis.h>`
`54`	`54`	`#include <grass/Vect.h>`
	`55`	`+#include <grass/version.h>`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`#include "qgsgrassplugin.h"`
`@@ -496,7 +497,7 @@ void QgsGrassPlugin::newVector()`
`496`	`497`	`return;`
`497`	`498`	`}`
`498`	`499`
`499`		`-#if defined(GRASS_VERSION_MAJOR) && defined(GRASS_VERSION_MINOR) && \`
	`500`	`+#if defined(GRASS_VERSION_MAJOR) && defined(GRASS_VERSION_MINOR) && \`
`500`	`501`	`( ( GRASS_VERSION_MAJOR == 6 && GRASS_VERSION_MINOR >= 4 ) \|\| GRASS_VERSION_MAJOR > 6 )`
`501`	`502`	`Vect_build ( &Map );`
`502`	`503`	`#else`