Sophie

Sophie

distrib > Mandriva > 2010.2 > i586 > media > contrib-release-src > by-pkgid > b3c3bc05794cc87fc6dc40744a37b5ba > files > 5

fdo-3.4.0-5mdv2010.1.src.rpm

--- OpenSource_FDO/Fdo/UnitTest/ExpressionParseTest.cpp~	2008-11-04 09:29:48.000000000 -0500
+++ OpenSource_FDO/Fdo/UnitTest/ExpressionParseTest.cpp	2009-06-03 00:18:20.000000000 -0400
@@ -13,6 +13,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+#include <cstdio>
 #include "Pch.h"
 #include "ExpressionParseTest.h"
 #ifdef _DEBUG
--- OpenSource_FDO/Fdo/UnitTest/ExpressionTest.cpp~	2006-09-26 17:10:03.000000000 -0400
+++ OpenSource_FDO/Fdo/UnitTest/ExpressionTest.cpp	2009-06-03 00:18:42.000000000 -0400
@@ -13,6 +13,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+#include <cstdio>
 #include "Pch.h"
 #include "ExpressionTest.h"
 #ifdef _DEBUG
--- OpenSource_FDO/Fdo/UnitTest/FilterParseTest.cpp~	2008-11-04 09:29:48.000000000 -0500
+++ OpenSource_FDO/Fdo/UnitTest/FilterParseTest.cpp	2009-06-03 00:19:08.000000000 -0400
@@ -13,6 +13,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+#include <cstdio>
 #include "Pch.h"
 #include "FilterParseTest.h"
 #ifdef _DEBUG
--- OpenSource_FDO/Fdo/UnitTest/FilterTest.cpp~	2006-12-01 09:17:49.000000000 -0500
+++ OpenSource_FDO/Fdo/UnitTest/FilterTest.cpp	2009-06-03 00:19:35.000000000 -0400
@@ -13,6 +13,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+#include <cstdio>
 #include "Pch.h"
 #include "FilterTest.h"
 #ifdef _DEBUG
--- OpenSource_FDO/Fdo/UnitTest/GeometryTest.cpp~	2006-10-11 10:16:45.000000000 -0400
+++ OpenSource_FDO/Fdo/UnitTest/GeometryTest.cpp	2009-06-03 00:19:59.000000000 -0400
@@ -13,6 +13,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+#include <cstdio>
 #include "Pch.h"
 #include "GeometryTest.h"
 #include <FdoGeometry.h>
--- OpenSource_FDO/Fdo/UnitTest/IoTest.cpp~	2006-09-27 16:57:07.000000000 -0400
+++ OpenSource_FDO/Fdo/UnitTest/IoTest.cpp	2009-06-03 00:20:41.000000000 -0400
@@ -13,6 +13,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+#include <cstdio>
 #include "Pch.h"
 #include "IoTest.h"
 #include "UnitTestUtil.h"
--- OpenSource_FDO/Fdo/UnitTest/TestProcessor.cpp~	2006-05-04 17:47:08.000000000 -0400
+++ OpenSource_FDO/Fdo/UnitTest/TestProcessor.cpp	2009-06-03 00:22:18.000000000 -0400
@@ -13,6 +13,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+#include <cstdio>
 #include "Pch.h"
 #include "TestProcessor.h"
 
--- OpenSource_FDO/Fdo/UnitTest/UnitTestUtil.cpp~	2006-07-12 09:02:02.000000000 -0400
+++ OpenSource_FDO/Fdo/UnitTest/UnitTestUtil.cpp	2009-06-03 00:22:51.000000000 -0400
@@ -17,6 +17,7 @@
 * 
  */
 
+#include <cstdio>
 #include "Pch.h"
 #include "UnitTestUtil.h"
 #ifdef _WIN32
--- OpenSource_FDO/Fdo/UnitTest/app.cpp~	2009-03-13 17:18:38.000000000 -0400
+++ OpenSource_FDO/Fdo/UnitTest/app.cpp	2009-06-03 00:10:49.000000000 -0400
@@ -15,6 +15,7 @@
 
 #include <cstring>
 #include <cstdlib>
+#include <cstdio>
 #include <cppunit/CompilerOutputter.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 #include <cppunit/ui/text/TestRunner.h>
--- OpenSource_FDO/Utilities/Common/Src/FdoCommonOSUtil.cpp~	2008-02-07 13:31:58.000000000 -0500
+++ OpenSource_FDO/Utilities/Common/Src/FdoCommonOSUtil.cpp	2009-06-03 00:23:56.000000000 -0400
@@ -19,6 +19,7 @@
 
 #include "stdafx.h"
 
+#include <cstdio>
 #include <math.h>
 
 #ifdef _WIN32
--- OpenSource_FDO/Utilities/ExpressionEngine/Src/FdoExpressionEngineImp.cpp~	2008-09-16 10:55:48.000000000 -0400
+++ OpenSource_FDO/Utilities/ExpressionEngine/Src/FdoExpressionEngineImp.cpp	2009-06-03 00:35:10.000000000 -0400
@@ -32,6 +32,7 @@
 #include <malloc.h>
 #include <math.h>
 #include <limits.h>
+#include <cstdio>
 
 #include <FdoExpressionEngineIAggregateFunction.h>
 #include <Util/FdoExpressionEngineUtilDataReader.h>
--- OpenSource_FDO/Utilities/TestCommon/Src/TestCommonConstraints.cpp~	2008-10-20 14:04:20.000000000 -0400
+++ OpenSource_FDO/Utilities/TestCommon/Src/TestCommonConstraints.cpp	2009-06-03 00:25:09.000000000 -0400
@@ -14,6 +14,7 @@
  // License along with this library; if not, write to the Free Software
  // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+#include <cstdio>
 #include "stdafx.h"
 #include "TestCommonConstraints.h"
 #include "TestCommonMiscUtil.h"
--- OpenSource_FDO/Utilities/TestCommon/Src/TestCommonFileUtil.cpp~	2009-06-03 00:05:03.000000000 -0400
+++ OpenSource_FDO/Utilities/TestCommon/Src/TestCommonFileUtil.cpp	2009-06-03 00:27:43.000000000 -0400
@@ -25,6 +25,7 @@
  */
 
 #include <cstring>
+#include <cstdio>
 
 #include "stdafx.h"
 #include "TestCommonFileUtil.h"
--- OpenSource_FDO/Utilities/TestCommon/Src/TestCommonGeomUtil.cpp~	2007-08-15 17:26:09.000000000 -0400
+++ OpenSource_FDO/Utilities/TestCommon/Src/TestCommonGeomUtil.cpp	2009-06-03 00:28:06.000000000 -0400
@@ -24,6 +24,7 @@
  *
  */
 
+#include <cstdio>
 #include "stdafx.h"
 #include <FdoSpatial.h>
 #include "TestCommonGeomUtil.h"
--- OpenSource_FDO/Utilities/TestCommon/Src/TestCommonInsert.cpp~	2008-10-20 14:04:20.000000000 -0400
+++ OpenSource_FDO/Utilities/TestCommon/Src/TestCommonInsert.cpp	2009-06-03 00:26:00.000000000 -0400
@@ -14,6 +14,7 @@
  // License along with this library; if not, write to the Free Software
  // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+#include <cstdio>
 #include "stdafx.h"
 #include "TestCommonInsert.h"
 #include "TestCommonMiscUtil.h"
--- OpenSource_FDO/Utilities/TestCommon/Src/TestCommonMiscUtil.cpp~	2008-12-08 12:22:51.000000000 -0500
+++ OpenSource_FDO/Utilities/TestCommon/Src/TestCommonMiscUtil.cpp	2009-06-03 00:26:29.000000000 -0400
@@ -24,6 +24,7 @@
  *
  */
 
+#include <cstdio>
 #include "stdafx.h"
 #include "TestCommonMiscUtil.h"
 
--- OpenSource_FDO/Providers/GDAL/Src/Overrides/FdoGrfpRasterImageDefinition.cpp~	2007-06-05 13:42:37.000000000 -0400
+++ OpenSource_FDO/Providers/GDAL/Src/Overrides/FdoGrfpRasterImageDefinition.cpp	2009-06-03 00:59:20.000000000 -0400
@@ -23,6 +23,7 @@
  *
  */
 
+#include <cstdio>
 #include "Overrides.h"
 #include "FdoGrfpXmlGlobals.h"
 #include <FdoCommonOSUtil.h>
--- OpenSource_FDO/Providers/GDAL/Src/UnitTest/UnitTestUtil.cpp~	2009-03-19 17:41:35.000000000 -0400
+++ OpenSource_FDO/Providers/GDAL/Src/UnitTest/UnitTestUtil.cpp	2009-06-03 01:44:36.000000000 -0400
@@ -23,6 +23,7 @@
 #endif
 
 #include <cstring>
+#include <cstdio>
 
 UnitTestUtil::UnitTestUtil(void)
 {
--- OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpNoConfigTest.h~	2006-06-13 11:41:16.000000000 -0400
+++ OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpNoConfigTest.h	2009-06-03 01:45:01.000000000 -0400
@@ -16,6 +16,8 @@
  *
  */
 
+
+#include <cstdio>
 #ifndef RFPNOCONFIGTEST_H
 #define RFPNOCONFIGTEST_H
 
--- OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpOverridesSerializeTest.h~	2006-06-13 11:41:16.000000000 -0400
+++ OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpOverridesSerializeTest.h	2009-06-03 01:46:41.000000000 -0400
@@ -22,6 +22,8 @@
 #pragma once
 #endif
 
+#include <cstdio>
+
 class RfpOverridesSerializeTest : public RfpTestCase
 {
 	FDO_CPPUNIT_DEFINE(testSerialize1);
--- OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpTestBand.h~	2006-11-14 16:20:06.000000000 -0500
+++ OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpTestBand.h	2009-06-03 01:51:29.000000000 -0400
@@ -22,6 +22,8 @@
 #pragma once
 #endif //_WIN32
 
+#include <cstdio>
+
 class RfpTestBand : public RfpTestCase
 {
 	FDO_CPPUNIT_DEFINE(testSelect);
--- OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpTestBandConfig.h~	2007-02-20 13:52:25.000000000 -0500
+++ OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpTestBandConfig.h	2009-06-03 01:52:53.000000000 -0400
@@ -22,6 +22,8 @@
 #pragma once
 #endif //_WIN32
 
+#include <cstdio>
+
 class RfpTestBandConfig : public RfpTestCase
 {
 	FDO_CPPUNIT_DEFINE(testOverrides);
--- OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpTestDem.h~	2006-06-13 11:41:16.000000000 -0400
+++ OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpTestDem.h	2009-06-03 01:52:31.000000000 -0400
@@ -22,6 +22,7 @@
 #pragma once
 #endif //_WIN32
 
+#include <cstdio>
 class RfpTestDem : public RfpTestCase
 {
 	FDO_CPPUNIT_DEFINE(testDataStream);		
--- OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpTestEcw.h~	2006-06-13 11:41:16.000000000 -0400
+++ OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpTestEcw.h	2009-06-03 01:52:11.000000000 -0400
@@ -22,6 +22,7 @@
 #pragma once
 #endif //_WIN32
 
+#include <cstdio>
 class RfpTestEcw : public RfpTestCase
 {
 	FDO_CPPUNIT_DEFINE(testRGB);		
--- OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpTestExample1.h~	2006-06-13 11:41:16.000000000 -0400
+++ OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpTestExample1.h	2009-06-03 01:47:18.000000000 -0400
@@ -22,6 +22,8 @@
 #pragma once
 #endif
 
+#include <cstdio>
+
 class RfpTestExample1 : public RfpTestCase
 {
 	FDO_CPPUNIT_DEFINE(testDescribeSchema);
--- OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpTestGeotiff.h~	2006-06-13 11:41:16.000000000 -0400
+++ OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpTestGeotiff.h	2009-06-03 01:48:09.000000000 -0400
@@ -22,6 +22,8 @@
 #pragma once
 #endif //_WIN32
 
+#include <cstdio>
+
 class RfpTestGeotiff : public RfpTestCase
 {
 	FDO_CPPUNIT_DEFINE(testGeotiff);			
--- OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpTestGetRaster.h~	2006-09-07 23:40:50.000000000 -0400
+++ OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpTestGetRaster.h	2009-06-03 01:48:39.000000000 -0400
@@ -22,6 +22,8 @@
 #pragma once
 #endif
 
+#include <cstdio>
+
 class RfpTestGetRaster : public RfpTestCase
 {
 	FDO_CPPUNIT_DEFINE(testGetClippedAndScaledRaster);
--- OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpTestJp2.h~	2006-06-13 11:41:16.000000000 -0400
+++ OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpTestJp2.h	2009-06-03 01:51:51.000000000 -0400
@@ -22,6 +22,8 @@
 #pragma once
 #endif //_WIN32
 
+#include <cstdio>
+
 class RfpTestJp2 : public RfpTestCase
 {
 	FDO_CPPUNIT_DEFINE(testRGB);		
--- OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpTestJpg.h~	2006-11-14 16:20:06.000000000 -0500
+++ OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpTestJpg.h	2009-06-03 01:53:45.000000000 -0400
@@ -31,6 +31,8 @@
 #pragma once
 #endif //_WIN32
 
+#include <cstdio>
+
 class RfpTestJpg : public RfpTestCase
 {
     FDO_CPPUNIT_DEFINE(testSpecialCharacters);
--- OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpTestMosaic.h~	2006-06-13 11:41:16.000000000 -0400
+++ OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpTestMosaic.h	2009-06-03 01:49:00.000000000 -0400
@@ -22,6 +22,8 @@
 #pragma once
 #endif //_WIN32
 
+#include <cstdio>
+
 class RfpTestMosaic : public RfpTestCase
 {
 	FDO_CPPUNIT_DEFINE(testClippedMosaic);		// 4 * 4	
--- OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpTestMrSID.h~	2006-06-13 11:41:16.000000000 -0400
+++ OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpTestMrSID.h	2009-06-03 01:50:29.000000000 -0400
@@ -22,6 +22,8 @@
 #pragma once
 #endif //_WIN32
 
+#include <cstdio>
+
 class RfpTestMrSID : public RfpTestCase
 {
 	FDO_CPPUNIT_DEFINE(testRGB);		
--- OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpTestPng.h~	2006-11-14 16:20:06.000000000 -0500
+++ OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpTestPng.h	2009-06-03 01:53:23.000000000 -0400
@@ -31,6 +31,7 @@
 #pragma once
 #endif //_WIN32
 
+#include <cstdio>
 class RfpTestPng : public RfpTestCase
 {
     FDO_CPPUNIT_DEFINE(testSpecialCharacters);
--- OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpTestRasterConversion.h~	2006-09-07 23:40:50.000000000 -0400
+++ OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpTestRasterConversion.h	2009-06-03 01:47:01.000000000 -0400
@@ -22,7 +22,7 @@
 #pragma once
 #endif //_WIN32
 
-
+#include <cstdio>
 class RfpTestRasterConversion : public RfpTestCase
 {
     FDO_CPPUNIT_DEFINE(testScaling);			
--- OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpTestSpatialContext.h~	2006-06-13 11:41:16.000000000 -0400
+++ OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpTestSpatialContext.h	2009-06-03 01:49:41.000000000 -0400
@@ -22,6 +22,8 @@
 #pragma once
 #endif //_WIN32
 
+#include <cstdio>
+
 class RfpTestSpatialContext : public RfpTestCase
 {
 	FDO_CPPUNIT_DEFINE(testSpatialContext1);
--- OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpTestSpatialQuery.h~	2007-06-05 17:04:10.000000000 -0400
+++ OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpTestSpatialQuery.h	2009-06-03 01:54:11.000000000 -0400
@@ -23,6 +23,8 @@
 #pragma once
 #endif //_WIN32
 
+#include <cstdio>
+
 class RfpTestSpatialQuery : public RfpTestCase
 {
     FDO_CPPUNIT_DEFINE(testConfigWithBounds);
--- OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpTestThorough.h~	2006-06-13 11:41:16.000000000 -0400
+++ OpenSource_FDO/Providers/GDAL/Src/UnitTest/RfpTestThorough.h	2009-06-03 01:50:02.000000000 -0400
@@ -22,6 +22,7 @@
 #pragma once
 #endif //_WIN32
 
+#include <cstdio>
 #include "RfpTestCase.h"
 
 class RfpTestThorough :	public RfpTestCase
--- OpenSource_FDO/Providers/SDF/Src/Utils/OSUtils.cpp~	2006-05-05 15:38:42.000000000 -0400
+++ OpenSource_FDO/Providers/SDF/Src/Utils/OSUtils.cpp	2009-06-03 02:52:13.000000000 -0400
@@ -18,6 +18,7 @@
  */
 
 #include "stdafx.h"
+#include <cstdio>
 #include <math.h>
 #include <time.h>
 
--- OpenSource_FDO/Providers/SDF/Src/Provider/SdfConnection.cpp~	2008-11-19 14:42:09.000000000 -0500
+++ OpenSource_FDO/Providers/SDF/Src/Provider/SdfConnection.cpp	2009-06-03 04:28:06.000000000 -0400
@@ -17,6 +17,7 @@
 //  
 #include "stdafx.h"
 #include <float.h>
+#include <cstdio>
 
 //for rmdir()
 #ifdef _WIN32
--- OpenSource_FDO/Providers/SDF/Src/Provider/SdfCreateDataStore.cpp~	2006-12-18 17:08:51.000000000 -0500
+++ OpenSource_FDO/Providers/SDF/Src/Provider/SdfCreateDataStore.cpp	2009-06-03 04:42:06.000000000 -0400
@@ -21,6 +21,7 @@
 #include "SdfConnection.h"
 #include "SdfCreateSpatialContext.h"
 #include <FdoCommonStringUtil.h>
+#include <cstdio>
 
 SdfCreateDataStore::SdfCreateDataStore(SdfConnection* connection)
 : SdfCommand<FdoICreateDataStore>(connection)
--- OpenSource_FDO/Providers/SDF/Src/Provider/SdfCreateSDFFile.cpp~	2007-08-15 17:27:28.000000000 -0400
+++ OpenSource_FDO/Providers/SDF/Src/Provider/SdfCreateSDFFile.cpp	2009-06-03 04:31:44.000000000 -0400
@@ -15,6 +15,7 @@
 //  License along with this library; if not, write to the Free Software
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //  
+#include <cstdio>
 #include "stdafx.h"
 #include "SdfCreateSDFFile.h"
 #include "SdfConnection.h"
--- OpenSource_FDO/Providers/SDF/Src/Provider/SdfImpExtendedSelect.cpp~	2008-01-09 15:10:43.000000000 -0500
+++ OpenSource_FDO/Providers/SDF/Src/Provider/SdfImpExtendedSelect.cpp	2009-06-03 04:40:44.000000000 -0400
@@ -17,6 +17,7 @@
 //  
 #include <iostream>
 #include <stdlib.h> 
+#include <cstdio>
 #include <algorithm>
 #include "stdafx.h"
 #include "SdfImpExtendedSelect.h"
--- OpenSource_FDO/Providers/SHP/Src/Provider/ShpFeatIdQueryEvaluator.cpp~	2007-09-05 17:43:51.000000000 -0400
+++ OpenSource_FDO/Providers/SHP/Src/Provider/ShpFeatIdQueryEvaluator.cpp	2009-06-03 05:19:44.000000000 -0400
@@ -21,7 +21,7 @@
 
 #include <float.h>
 #include <math.h>
-
+#include <cstdio>
 #include <algorithm>
 #include <functional>
 
--- OpenSource_FDO/Providers/SHP/Src/ShpRead/RowData.cpp~	2009-01-23 11:27:20.000000000 -0500
+++ OpenSource_FDO/Providers/SHP/Src/ShpRead/RowData.cpp	2009-06-03 05:14:09.000000000 -0400
@@ -24,6 +24,7 @@
 #include <wctype.h>
 #include <FdoCommonOSUtil.h>
 #include <math.h>
+#include <cstdio>
 
 /*****************************************************************************
  * Name         : RowData
--- OpenSource_FDO/Providers/SHP/Src/ShpRead/ShapeFile.cpp~	2008-08-06 10:57:43.000000000 -0400
+++ OpenSource_FDO/Providers/SHP/Src/ShpRead/ShapeFile.cpp	2009-06-03 05:16:18.000000000 -0400
@@ -23,6 +23,7 @@
 #include "ShapeFile.h"
 #include "Constants.h"
 #include <limits>
+#include <cstdio>
 using namespace std;
 #undef min
 #undef max
--- OpenSource_FDO/Providers/SHP/Src/UnitTest/BigPerformanceTests.cpp~	2007-02-22 13:32:46.000000000 -0500
+++ OpenSource_FDO/Providers/SHP/Src/UnitTest/BigPerformanceTests.cpp	2009-06-03 05:27:40.000000000 -0400
@@ -19,7 +19,7 @@
 
 #include "Pch.h"
 #include "BigPerformanceTests.h"
-
+#include <cstdio>
 #include <FdoSpatial.h>
 #include <FdoCommonFile.h>
 
--- OpenSource_FDO/Providers/SHP/Src/UnitTest/ConnectionInfoTests.cpp~	2006-10-12 10:48:20.000000000 -0400
+++ OpenSource_FDO/Providers/SHP/Src/UnitTest/ConnectionInfoTests.cpp	2009-06-03 05:22:54.000000000 -0400
@@ -17,7 +17,7 @@
 * 
  */
 
-
+#include <cstdio>
 #include "Pch.h"
 #include "ConnectionInfoTests.h"
 #include <Spatial/SpatialStd.h>
--- OpenSource_FDO/Providers/SHP/Src/UnitTest/ExtendedSelectTests.cpp~	2008-11-05 14:50:32.000000000 -0500
+++ OpenSource_FDO/Providers/SHP/Src/UnitTest/ExtendedSelectTests.cpp	2009-06-03 05:28:02.000000000 -0400
@@ -2,6 +2,7 @@
 #include "Pch.h"
 
 #include <ctime>
+#include <cstdio>
 #include "ExtendedSelectTests.h"
 #include "SHP/IExtendedSelect.h"
 #include "SHP/ShpCommandType.h"
--- OpenSource_FDO/Providers/SHP/Src/UnitTest/FdoExpressionFunctionTest.cpp~	2009-01-16 16:45:23.000000000 -0500
+++ OpenSource_FDO/Providers/SHP/Src/UnitTest/FdoExpressionFunctionTest.cpp	2009-06-03 05:28:21.000000000 -0400
@@ -19,6 +19,7 @@
 #include "Pch.h"
 #include "FdoExpressionFunctionTest.h"
 #include <math.h>
+#include <cstdio>
 
 
 CPPUNIT_TEST_SUITE_REGISTRATION(FdoExpressionFunctionTest);
--- OpenSource_FDO/Providers/SHP/Src/UnitTest/FilterTests.cpp~	2007-02-22 13:32:46.000000000 -0500
+++ OpenSource_FDO/Providers/SHP/Src/UnitTest/FilterTests.cpp	2009-06-03 05:26:22.000000000 -0400
@@ -17,6 +17,7 @@
 * 
  */
 
+#include <cstdio>
 #include "Pch.h"
 #include "FilterTests.h"
 
--- OpenSource_FDO/Providers/SHP/Src/UnitTest/InsertTests.cpp~	2007-12-05 15:50:27.000000000 -0500
+++ OpenSource_FDO/Providers/SHP/Src/UnitTest/InsertTests.cpp	2009-06-03 05:24:56.000000000 -0400
@@ -19,7 +19,7 @@
 
 #include "Pch.h"
 #include "InsertTests.h"
-
+#include <cstdio>
 #include <FdoSpatial.h>
 #include <FdoCommonFile.h>
 #include <ShapeCPG.h> 
--- OpenSource_FDO/Providers/SHP/Src/UnitTest/PerformanceTests.cpp~	2007-02-22 13:32:46.000000000 -0500
+++ OpenSource_FDO/Providers/SHP/Src/UnitTest/PerformanceTests.cpp	2009-06-03 05:27:15.000000000 -0400
@@ -19,7 +19,7 @@
 
 #include "Pch.h"
 #include "PerformanceTests.h"
-
+#include <cstdio>
 #include <FdoSpatial.h>
 #include <FdoCommonFile.h>
 
--- OpenSource_FDO/Providers/SHP/Src/UnitTest/SchemaTests.cpp~	2008-04-10 11:06:17.000000000 -0400
+++ OpenSource_FDO/Providers/SHP/Src/UnitTest/SchemaTests.cpp	2009-06-03 05:25:32.000000000 -0400
@@ -23,7 +23,7 @@
 #include "ShpProvider.h"
 #include "FdoCommonFile.h"
 #include "FdoCommonSchemaUtil.h"
-
+#include <cstdio>
 
 #ifdef _WIN32
 #define LOCATION L"..\\..\\TestData\\Testing\\"
--- OpenSource_FDO/Providers/SHP/Src/UnitTest/SelectAggregatesTests.cpp~	2007-02-22 13:32:46.000000000 -0500
+++ OpenSource_FDO/Providers/SHP/Src/UnitTest/SelectAggregatesTests.cpp	2009-06-03 05:23:55.000000000 -0400
@@ -19,7 +19,7 @@
 
 #include "Pch.h"
 #include "SelectAggregatesTests.h"
-
+#include <cstdio>
 #include <FdoSpatial.h>
 #include <FdoCommonFile.h>
 
--- OpenSource_FDO/Providers/SHP/Src/UnitTest/SelectTests.cpp~	2007-10-05 14:46:45.000000000 -0400
+++ OpenSource_FDO/Providers/SHP/Src/UnitTest/SelectTests.cpp	2009-06-03 05:23:28.000000000 -0400
@@ -17,7 +17,7 @@
 * 
  */
 
-
+#include <cstdio>
 #include "Pch.h"
 #include "SelectTests.h"
 #include <Spatial/SpatialStd.h>
--- OpenSource_FDO/Providers/SHP/Src/UnitTest/ShpTests.cpp~	2008-11-03 14:00:13.000000000 -0500
+++ OpenSource_FDO/Providers/SHP/Src/UnitTest/ShpTests.cpp	2009-06-03 05:22:03.000000000 -0400
@@ -20,7 +20,7 @@
 #include "Pch.h"
 #include "ShpTests.h"
 #include <FdoSpatial.h>
-
+#include <cstdio>
 #include <FdoCommonFile.h>
 
 #define SHP_MESSAGE_DEFINE
--- OpenSource_FDO/Providers/SHP/Src/UnitTest/SpatialFilterTests.cpp~	2007-03-28 15:51:17.000000000 -0400
+++ OpenSource_FDO/Providers/SHP/Src/UnitTest/SpatialFilterTests.cpp	2009-06-03 05:26:56.000000000 -0400
@@ -19,7 +19,7 @@
 
 #include "Pch.h"
 #include "SpatialFilterTests.h"
-
+#include <cstdio>
 #include <ShpSpatialIndex.h>
 #include <ShapeFile.h>
 #include <ShapeIndex.h>
--- OpenSource_FDO/Providers/WMS/Src/UnitTest/ConnectTests.cpp~	2006-12-08 16:44:09.000000000 -0500
+++ OpenSource_FDO/Providers/WMS/Src/UnitTest/ConnectTests.cpp	2009-06-03 08:55:48.000000000 -0400
@@ -16,6 +16,7 @@
  *
  */
 
+#include <cstdio>
 #include "Pch.h"
 #include "ConnectTests.h"
 
--- OpenSource_FDO/Providers/WMS/Src/UnitTest/UnitTestUtil.cpp~	2006-07-18 13:46:59.000000000 -0400
+++ OpenSource_FDO/Providers/WMS/Src/UnitTest/UnitTestUtil.cpp	2009-06-03 08:56:17.000000000 -0400
@@ -18,6 +18,7 @@
 
 #include "Pch.h"
 #include "UnitTestUtil.h"
+#include <cstdio>
 #ifdef _WIN32
 #include <io.h>
 #include <stddef.h>
--- OpenSource_FDO/Providers/WMS/Src/UnitTest/WmsTests.cpp~	2008-11-03 14:52:15.000000000 -0500
+++ OpenSource_FDO/Providers/WMS/Src/UnitTest/WmsTests.cpp	2009-06-03 08:55:14.000000000 -0400
@@ -16,6 +16,7 @@
  *
  */
 
+#include <cstdio>
 #include "Pch.h"
 #include "WmsTests.h"