--- src/qgis_0.9.1/src/app/composer/qgscomposition.cpp~ 2007-11-23 23:56:10.000000000 +0100 +++ src/qgis_0.9.1/src/app/composer/qgscomposition.cpp 2008-04-04 23:16:39.000000000 +0200 @@ -13,6 +13,8 @@ * (at your option) any later version. * * * ***************************************************************************/ +#include + #include "qgscomposition.h" #include "qgscomposer.h" --- src/qgis_0.9.1/src/app/qgsvectorlayerproperties.cpp~ 2007-11-29 11:16:43.000000000 +0100 +++ src/qgis_0.9.1/src/app/qgsvectorlayerproperties.cpp 2008-04-04 23:21:26.000000000 +0200 @@ -16,6 +16,7 @@ * * ***************************************************************************/ /* $Id: qgsvectorlayerproperties.cpp 7683 2007-11-29 10:16:43Z timlinux $ */ +#include #include "qgsvectorlayerproperties.h" --- src/qgis_0.9.1/src/core/qgsvectordataprovider.cpp~ 2007-07-06 15:39:41.000000000 +0200 +++ src/qgis_0.9.1/src/core/qgsvectordataprovider.cpp 2008-04-04 23:23:02.000000000 +0200 @@ -17,6 +17,7 @@ #include #include // for DBL_MAX +#include #include "qgsvectordataprovider.h" #include "qgsfeature.h" --- src/qgis_0.9.1/src/core/qgsvectorlayer.cpp~ 2007-11-27 22:35:10.000000000 +0100 +++ src/qgis_0.9.1/src/core/qgsvectorlayer.cpp 2008-04-04 23:24:28.000000000 +0200 @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include --- src/qgis_0.9.1/src/core/spatialindex/geometry/LineSegment.cc~ 2007-09-27 21:41:16.000000000 +0200 +++ src/qgis_0.9.1/src/core/spatialindex/geometry/LineSegment.cc 2008-04-04 23:26:24.000000000 +0200 @@ -19,6 +19,8 @@ // Email: // mhadji@gmail.com +#include +#include #include Tools::Geometry::LineSegment::LineSegment() --- src/qgis_0.9.1/src/core/spatialindex/geometry/Point.cc~ 2007-01-09 03:39:15.000000000 +0100 +++ src/qgis_0.9.1/src/core/spatialindex/geometry/Point.cc 2008-04-04 23:27:18.000000000 +0200 @@ -19,6 +19,8 @@ // Email: // mhadji@gmail.com +#include +#include #include Tools::Geometry::Point::Point() --- src/qgis_0.9.1/src/core/spatialindex/include/RTree.h~ 2007-09-27 21:41:16.000000000 +0200 +++ src/qgis_0.9.1/src/core/spatialindex/include/RTree.h 2008-04-04 23:28:32.000000000 +0200 @@ -75,7 +75,7 @@ namespace SpatialIndex // definition extern ISpatialIndex* returnRTree(IStorageManager& sm, Tools::PropertySet& ps); #else - extern ISpatialIndex* returnRTree(IStorageManager& in, Tools::PropertySet& in); + extern ISpatialIndex* returnRTree(IStorageManager& in0, Tools::PropertySet& in1); #endif//_MSC_VER extern ISpatialIndex* createNewRTree( IStorageManager& sm, --- src/qgis_0.9.1/src/core/spatialindex/include/SpatialIndex.h~ 2007-09-27 21:41:16.000000000 +0200 +++ src/qgis_0.9.1/src/core/spatialindex/include/SpatialIndex.h 2008-04-04 23:29:34.000000000 +0200 @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include "Tools.h" @@ -188,7 +188,7 @@ namespace SpatialIndex // definition extern IBuffer* returnRandomEvictionsBuffer(IStorageManager& sm, Tools::PropertySet& ps); #else - extern IBuffer* returnRandomEvictionsBuffer(IStorageManager& in, Tools::PropertySet& in); + extern IBuffer* returnRandomEvictionsBuffer(IStorageManager& in0, Tools::PropertySet& in1); #endif//_MSC_VER extern IBuffer* createNewRandomEvictionsBuffer(IStorageManager& in, unsigned int capacity, bool bWriteThrough); } --- src/qgis_0.9.1/src/core/spatialindex/rtree/BulkLoader.cc~ 2007-11-05 02:23:41.000000000 +0100 +++ src/qgis_0.9.1/src/core/spatialindex/rtree/BulkLoader.cc 2008-04-04 23:31:03.000000000 +0200 @@ -21,6 +21,7 @@ #include #include +#include #include "../spatialindex/SpatialIndexImpl.h" --- src/qgis_0.9.1/src/core/spatialindex/rtree/Leaf.cc~ 2007-09-27 21:41:16.000000000 +0200 +++ src/qgis_0.9.1/src/core/spatialindex/rtree/Leaf.cc 2008-04-04 23:32:13.000000000 +0200 @@ -136,6 +136,7 @@ void Leaf::deleteData(long id, std::stac // keep this in the for loop. The tree height might change after insertions. byte* overflowTable = new byte[m_pTree->m_stats.m_treeHeight]; bzero(overflowTable, m_pTree->m_stats.m_treeHeight); + memset(overflowTable, 0, m_pTree->m_stats.m_treeHeight); m_pTree->insertData_impl(n->m_pDataLength[cChild], n->m_pData[cChild], *(n->m_ptrMBR[cChild]), n->m_pIdentifier[cChild], n->m_level, overflowTable); n->m_pData[cChild] = 0; delete[] overflowTable; --- src/qgis_0.9.1/src/core/spatialindex/rtree/Node.cc~ 2007-09-27 21:41:16.000000000 +0200 +++ src/qgis_0.9.1/src/core/spatialindex/rtree/Node.cc 2008-04-04 23:33:07.000000000 +0200 @@ -593,6 +593,7 @@ void Node::rtreeSplit(unsigned long data // use this mask array for marking visited entries. byte* mask = new byte[m_capacity + 1]; bzero(mask, m_capacity + 1); + memset(mask, 0, m_capacity + 1); // insert new data in the node for easier manipulation. Data arrays are always // by one larger than node capacity. --- src/qgis_0.9.1/src/core/spatialindex/rtree/RTree.cc~ 2007-11-05 02:23:41.000000000 +0100 +++ src/qgis_0.9.1/src/core/spatialindex/rtree/RTree.cc 2008-04-04 23:34:10.000000000 +0200 @@ -1098,6 +1098,7 @@ void SpatialIndex::RTree::RTree::insertD overflowTable = new byte[root->m_level]; bzero(overflowTable, root->m_level); + memset(mask, 0, m_capacity + 1); NodePtr l = root->chooseSubtree(mbr, 0, pathBuffer); if (l.get() == root.get()) --- src/qgis_0.9.1/src/core/spatialindex/storagemanager/Buffer.h~ 2007-01-09 03:39:15.000000000 +0100 +++ src/qgis_0.9.1/src/core/spatialindex/storagemanager/Buffer.h 2008-04-04 23:43:45.000000000 +0200 @@ -22,6 +22,8 @@ #ifndef __storagemanager_buffer_h #define __storagemanager_buffer_h +#include + namespace SpatialIndex { namespace StorageManager --- src/qgis_0.9.1/src/core/spatialindex/storagemanager/DiskStorageManager.cc~ 2007-09-27 21:41:16.000000000 +0200 +++ src/qgis_0.9.1/src/core/spatialindex/storagemanager/DiskStorageManager.cc 2008-04-04 23:46:09.000000000 +0200 @@ -26,6 +26,7 @@ #include #include #include +#include #ifdef WIN32 #include @@ -195,6 +196,7 @@ DiskStorageManager::DiskStorageManager(T // create buffer. m_buffer = new byte[m_pageSize]; bzero(m_buffer, m_pageSize); + memset(m_buffer, 0, m_pageSize); if (bOverwrite == false) { --- src/qgis_0.9.1/src/core/spatialindex/storagemanager/MemoryStorageManager.h~ 2007-01-09 03:39:15.000000000 +0100 +++ src/qgis_0.9.1/src/core/spatialindex/storagemanager/MemoryStorageManager.h 2008-04-04 23:48:08.000000000 +0200 @@ -18,6 +18,7 @@ // // Email: // mhadji@gmail.com +#include #ifndef __storagemanager_memorystoragemanager_h #define __storagemanager_memorystoragemanager_h --- src/qgis_0.9.1/src/core/spatialindex/tools/Tools.cc~ 2007-11-05 02:23:41.000000000 +0100 +++ src/qgis_0.9.1/src/core/spatialindex/tools/Tools.cc 2008-04-04 23:49:00.000000000 +0200 @@ -19,6 +19,9 @@ // Email: // mhadji@gmail.com +#include +#include +#include #include #include "ExternalSort.h" //#include "SHA1.h" --- src/qgis_0.9.1/src/plugins/grass/qgsgrassmapcalc.cpp~ 2007-05-08 03:56:36.000000000 +0200 +++ src/qgis_0.9.1/src/plugins/grass/qgsgrassmapcalc.cpp 2008-04-04 23:50:19.000000000 +0200 @@ -13,6 +13,7 @@ * * *************************************************************************/ #include +#include #include #include --- src/qgis_0.9.1/src/plugins/grass/qgsgrassmodule.cpp~ 2007-12-04 10:00:22.000000000 +0100 +++ src/qgis_0.9.1/src/plugins/grass/qgsgrassmodule.cpp 2008-04-04 23:53:39.000000000 +0200 @@ -76,6 +76,8 @@ #include "qgsfield.h" #include "qgsfeature.h" +#include + extern "C" { #include #include @@ -292,7 +294,7 @@ QgsGrassModule::QgsGrassModule ( QgsGras connect ( &mProcess, SIGNAL(readyReadStandardError()), this, SLOT(readStderr())); connect ( &mProcess, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(finished(int,QProcess::ExitStatus))); - char *env = "GRASS_MESSAGE_FORMAT=gui"; + const char *env = "GRASS_MESSAGE_FORMAT=gui"; char *envstr = new char[strlen(env)+1]; strcpy ( envstr, env ); putenv( envstr ); @@ -1226,7 +1228,7 @@ void QgsGrassModule::run() * G_GISRC_MODE_MEMORY mode, the variable remains set in variable when a module is run * -> unset GISRC_MODE_MEMORY. Remove later once 6.1.x / 6.0.1 is widespread. */ - putenv ( "GISRC_MODE_MEMORY" ); // unset + putenv ( (char*) "GISRC_MODE_MEMORY" ); // unset mOutputTextBrowser->clear(); --- src/qgis_0.9.1/src/plugins/qgisplugin.h~ 2007-09-16 22:18:38.000000000 +0200 +++ src/qgis_0.9.1/src/plugins/qgisplugin.h 2008-04-04 23:57:23.000000000 +0200 @@ -61,7 +61,7 @@ class QgisPlugin @todo XXX this may be a hint that there should be subclasses */ - typedef enum PLUGINTYPE + enum PLUGINTYPE { UI = 1, /* user interface plug-in */ MAPLAYER, /* map layer plug-in */ --- src/qgis_0.9.1/src/providers/gpx/gpsdata.cpp~ 2007-02-01 16:44:20.000000000 +0100 +++ src/qgis_0.9.1/src/providers/gpx/gpsdata.cpp 2008-04-04 23:58:11.000000000 +0200 @@ -17,6 +17,7 @@ #include #include +#include #include #include --- src/qgis_0.9.1/src/providers/gpx/qgsgpxprovider.cpp~ 2007-11-05 02:23:41.000000000 +0100 +++ src/qgis_0.9.1/src/providers/gpx/qgsgpxprovider.cpp 2008-04-04 23:59:02.000000000 +0200 @@ -21,6 +21,7 @@ #include #include #include +#include #include // Changed #include to . Apparently some --- src/qgis_0.9.1/src/providers/postgres/qgspostgisbox2d.cpp~ 2007-01-09 03:39:15.000000000 +0100 +++ src/qgis_0.9.1/src/providers/postgres/qgspostgisbox2d.cpp 2008-04-04 23:59:57.000000000 +0200 @@ -18,6 +18,7 @@ /* $Id: qgspostgisbox2d.cpp 6415 2007-01-09 02:39:15Z wonder $ */ #include +#include #include --- src/qgis_0.9.1/src/providers/postgres/qgspostgisbox3d.cpp~ 2007-01-09 03:39:15.000000000 +0100 +++ src/qgis_0.9.1/src/providers/postgres/qgspostgisbox3d.cpp 2008-04-05 00:00:58.000000000 +0200 @@ -18,6 +18,7 @@ /* $Id: qgspostgisbox3d.cpp 6415 2007-01-09 02:39:15Z wonder $ */ #include +#include #include