[mapguide-commits] r5935 - in trunk/MgDev: Common/Stylization Oem/geos-2.2.0/source/io/markup

[svn_mapguide at osgeo.org]

Author: hubu
Date: 2011-06-19 22:06:01 -0700 (Sun, 19 Jun 2011)
New Revision: 5935

Modified:
   trunk/MgDev/Common/Stylization/Band.h
   trunk/MgDev/Common/Stylization/BandData.h
   trunk/MgDev/Common/Stylization/MathHelper.h
   trunk/MgDev/Oem/geos-2.2.0/source/io/markup/MarkupSTL.cpp
Log:
Fix break build of MapGuide Server and Oem

Modified: trunk/MgDev/Common/Stylization/Band.h
===================================================================
--- trunk/MgDev/Common/Stylization/Band.h	2011-06-17 18:04:47 UTC (rev 5934)
+++ trunk/MgDev/Common/Stylization/Band.h	2011-06-20 05:06:01 UTC (rev 5935)
@@ -23,6 +23,7 @@
 #include "Vector3D.h"
 #include "Point2D.h"
 #include "Point3D.h"
+#include "Foundation.h"
 #include <assert.h>
 //////////////////////////////////////////////////////////////////////////
 

Modified: trunk/MgDev/Common/Stylization/BandData.h
===================================================================
--- trunk/MgDev/Common/Stylization/BandData.h	2011-06-17 18:04:47 UTC (rev 5934)
+++ trunk/MgDev/Common/Stylization/BandData.h	2011-06-20 05:06:01 UTC (rev 5935)
@@ -17,7 +17,7 @@
 
 #ifndef BANDDATA_H_
 #define BANDDATA_H_
-
+#include "Foundation.h"
 #include <assert.h>
 
 //////////////////////////////////////////////////////////////////////////

Modified: trunk/MgDev/Common/Stylization/MathHelper.h
===================================================================
--- trunk/MgDev/Common/Stylization/MathHelper.h	2011-06-17 18:04:47 UTC (rev 5934)
+++ trunk/MgDev/Common/Stylization/MathHelper.h	2011-06-20 05:06:01 UTC (rev 5935)
@@ -19,6 +19,7 @@
 #define MATHHELPER_H_
 
 #include <math.h>
+#include "Foundation.h"
 #include <assert.h>
 
 const double EPSILON = 1e-10;

Modified: trunk/MgDev/Oem/geos-2.2.0/source/io/markup/MarkupSTL.cpp
===================================================================
--- trunk/MgDev/Oem/geos-2.2.0/source/io/markup/MarkupSTL.cpp	2011-06-17 18:04:47 UTC (rev 5934)
+++ trunk/MgDev/Oem/geos-2.2.0/source/io/markup/MarkupSTL.cpp	2011-06-20 05:06:01 UTC (rev 5935)
@@ -336,7 +336,11 @@
 	if ( szName )
 	{
 		char szFormat[300];
+#ifdef _WIN32
 		sprintf_s( szFormat, szError, szName );
+#else
+        sprintf( szFormat, szError, szName );
+#endif
 		m_strError = szFormat;
 	}
 	else