enable grass provider/plugin and pggeoprocessing plugin in windows

jef · jef · commit 435b944a69ad · 2007-11-05T23:50:38.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7330 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/plugins/geoprocessing/qgspggeoprocessing.cpp b/src/plugins/geoprocessing/qgspggeoprocessing.cpp
@@ -440,37 +440,37 @@ void QgsPgGeoprocessing::unload()
  * of the plugin class
  */
 // Class factory to return a new instance of the plugin class
-extern "C" QgisPlugin * classFactory(QgisInterface * qI)
+QGISEXTERN QgisPlugin * classFactory(QgisInterface * qI)
 {
   return new QgsPgGeoprocessing(qI);
 }
 
 // Return the name of the plugin
-extern "C" QString name()
+QGISEXTERN QString name()
 {
     return name_;
 }
 
 // Return the description
-extern "C" QString description()
+QGISEXTERN QString description()
 {
     return description_;
 }
 
 // Return the type (either UI or MapLayer plugin)
-extern "C" int type()
+QGISEXTERN int type()
 {
     return type_;
 }
 
 // Return the version number for the plugin
-extern "C" QString version()
+QGISEXTERN QString version()
 {
   return version_;
 }
 
 // Delete ourself
-extern "C" void unload(QgisPlugin * p)
+QGISEXTERN void unload(QgisPlugin * p)
 {
   delete p;
 }
diff --git a/src/plugins/grass/qgsgrassplugin.cpp b/src/plugins/grass/qgsgrassplugin.cpp
@@ -826,38 +826,38 @@ void QgsGrassPlugin::unload()
  * of the plugin class
  */
 // Class factory to return a new instance of the plugin class
-extern "C" QgisPlugin * classFactory(QgisInterface * theQgisInterfacePointer)
+QGISEXTERN QgisPlugin * classFactory(QgisInterface * theQgisInterfacePointer)
 {
   return new QgsGrassPlugin(theQgisInterfacePointer);
 }
 
 // Return the name of the plugin - note that we do not user class members as
 // the class may not yet be insantiated when this method is called.
-extern "C" QString name()
+QGISEXTERN QString name()
 {
   return QObject::tr("GRASS");
 }
 
 // Return the description
-extern "C" QString description()
+QGISEXTERN QString description()
 {
   return QObject::tr("GRASS layer");
 }
 
 // Return the type (either UI or MapLayer plugin)
-extern "C" int type()
+QGISEXTERN int type()
 {
   return QgisPlugin::UI;
 }
 
 // Return the version number for the plugin
-extern "C" QString version()
+QGISEXTERN QString version()
 {
   return pluginVersion;
 }
 
 // Delete ourself
-extern "C" void unload(QgisPlugin * thePluginPointer)
+QGISEXTERN void unload(QgisPlugin * thePluginPointer)
 {
   delete thePluginPointer;
 }
diff --git a/src/providers/grass/provider.cpp b/src/providers/grass/provider.cpp
@@ -27,12 +27,21 @@
 #include "qgsfield.h"
 #include "qgsrect.h"
 
+#ifdef _MSC_VER
+// enables prototype in GRASS headers
+#define __STDC__ 1
+#endif
+
 extern "C" {
 #include <grass/gis.h>
 #include <grass/dbmi.h>
 #include <grass/Vect.h>
 }
 
+#ifdef _MSC_VER
+#undef __STDC__
+#endif
+
 #include "qgsgrass.h"
 #include "qgsgrassprovider.h"
 
diff --git a/src/providers/grass/qgsgrassprovider.cpp b/src/providers/grass/qgsgrassprovider.cpp
@@ -36,13 +36,22 @@
 #include "qgsrect.h"
 #include "qgsspatialrefsys.h"
 
+#ifdef _MSC_VER
+// enable grass prototypes
+#define __STDC__ 1
+#endif
+
 extern "C" {
 #include <grass/gprojects.h>
 #include <grass/gis.h>
 #include <grass/dbmi.h>
 #include <grass/Vect.h>
 }
 
+#ifdef _MSC_VER
+#undef __STDC__
+#endif
+
 #include "qgsgrass.h"
 #include "qgsgrassprovider.h"
 

Original file line number	Diff line number	Diff line change
`@@ -440,37 +440,37 @@ void QgsPgGeoprocessing::unload()`
`440`	`440`	`* of the plugin class`
`441`	`441`	`*/`
`442`	`442`	`// Class factory to return a new instance of the plugin class`
`443`		`-extern "C" QgisPlugin * classFactory(QgisInterface * qI)`
	`443`	`+QGISEXTERN QgisPlugin * classFactory(QgisInterface * qI)`
`444`	`444`	`{`
`445`	`445`	`return new QgsPgGeoprocessing(qI);`
`446`	`446`	`}`
`447`	`447`
`448`	`448`	`// Return the name of the plugin`
`449`		`-extern "C" QString name()`
	`449`	`+QGISEXTERN QString name()`
`450`	`450`	`{`
`451`	`451`	`return name_;`
`452`	`452`	`}`
`453`	`453`
`454`	`454`	`// Return the description`
`455`		`-extern "C" QString description()`
	`455`	`+QGISEXTERN QString description()`
`456`	`456`	`{`
`457`	`457`	`return description_;`
`458`	`458`	`}`
`459`	`459`
`460`	`460`	`// Return the type (either UI or MapLayer plugin)`
`461`		`-extern "C" int type()`
	`461`	`+QGISEXTERN int type()`
`462`	`462`	`{`
`463`	`463`	`return type_;`
`464`	`464`	`}`
`465`	`465`
`466`	`466`	`// Return the version number for the plugin`
`467`		`-extern "C" QString version()`
	`467`	`+QGISEXTERN QString version()`
`468`	`468`	`{`
`469`	`469`	`return version_;`
`470`	`470`	`}`
`471`	`471`
`472`	`472`	`// Delete ourself`
`473`		`-extern "C" void unload(QgisPlugin * p)`
	`473`	`+QGISEXTERN void unload(QgisPlugin * p)`
`474`	`474`	`{`
`475`	`475`	`delete p;`
`476`	`476`	`}`
Original file line number	Diff line number	Diff line change
`@@ -826,38 +826,38 @@ void QgsGrassPlugin::unload()`
`826`	`826`	`* of the plugin class`
`827`	`827`	`*/`
`828`	`828`	`// Class factory to return a new instance of the plugin class`
`829`		`-extern "C" QgisPlugin * classFactory(QgisInterface * theQgisInterfacePointer)`
	`829`	`+QGISEXTERN QgisPlugin * classFactory(QgisInterface * theQgisInterfacePointer)`
`830`	`830`	`{`
`831`	`831`	`return new QgsGrassPlugin(theQgisInterfacePointer);`
`832`	`832`	`}`
`833`	`833`
`834`	`834`	`// Return the name of the plugin - note that we do not user class members as`
`835`	`835`	`// the class may not yet be insantiated when this method is called.`
`836`		`-extern "C" QString name()`
	`836`	`+QGISEXTERN QString name()`
`837`	`837`	`{`
`838`	`838`	`return QObject::tr("GRASS");`
`839`	`839`	`}`
`840`	`840`
`841`	`841`	`// Return the description`
`842`		`-extern "C" QString description()`
	`842`	`+QGISEXTERN QString description()`
`843`	`843`	`{`
`844`	`844`	`return QObject::tr("GRASS layer");`
`845`	`845`	`}`
`846`	`846`
`847`	`847`	`// Return the type (either UI or MapLayer plugin)`
`848`		`-extern "C" int type()`
	`848`	`+QGISEXTERN int type()`
`849`	`849`	`{`
`850`	`850`	`return QgisPlugin::UI;`
`851`	`851`	`}`
`852`	`852`
`853`	`853`	`// Return the version number for the plugin`
`854`		`-extern "C" QString version()`
	`854`	`+QGISEXTERN QString version()`
`855`	`855`	`{`
`856`	`856`	`return pluginVersion;`
`857`	`857`	`}`
`858`	`858`
`859`	`859`	`// Delete ourself`
`860`		`-extern "C" void unload(QgisPlugin * thePluginPointer)`
	`860`	`+QGISEXTERN void unload(QgisPlugin * thePluginPointer)`
`861`	`861`	`{`
`862`	`862`	`delete thePluginPointer;`
`863`	`863`	`}`