1--- misc/silgraphite-2.3.1/wrappers/win32/WinFont.cpp	2013-05-27 11:54:18.432327600 +0200
2+++ misc/build/silgraphite-2.3.1/wrappers/win32/WinFont.cpp	2013-05-27 11:52:02.662562100 +0200
3@@ -869,7 +869,7 @@
4
5 } // namespace gr
6
7-template stdext::hash_map<
8+template hashmap_ns::hash_map<
9 	gr::WinFont::LogFontWrapper,
10 	gr::WinFont::FontHandleCache::FontCacheValue,
11 	gr::WinFont::LogFontHashFuncs>;
12--- misc/silgraphite-2.3.1/wrappers/win32/WinFont.h	2013-05-27 11:56:04.110372100 +0200
13+++ misc/build/silgraphite-2.3.1/wrappers/win32/WinFont.h	2013-05-27 11:55:56.412931800 +0200
14@@ -28,8 +28,12 @@
15 #include "Font.h"
16 #include <map>
17
18-#ifdef _STLPORT_VERSION
19-namespace stdext = _STLP_STD;
20+#ifdef SYSTEM_STL_HASHMAP
21+namespace hashmap_ns = std;
22+#elif defined(_STLPORT_VERSION)
23+namespace hashmap_ns = _STLP_STD;
24+#else
25+namespace hashmap_ns = stdext;
26 #endif
27
28 namespace gr
29@@ -212,7 +216,7 @@
30         FontCacheValue GetCache(LOGFONT & lf);
31 		void DeleteFont(HFONT hfont);
32
33-		typedef stdext::hash_map<LogFontWrapper, FontCacheValue, LogFontHashFuncs> FontHandleHashMap;
34+		typedef hashmap_ns::hash_map<LogFontWrapper, FontCacheValue, LogFontHashFuncs> FontHandleHashMap;
35
36 	protected:
37 		FontHandleHashMap m_hmlffcv;
38--- misc/silgraphite-2.3.1/engine/include/graphite/GrCommon.h	2013-05-27 15:10:31.799725700 +0200
39+++ misc/build/silgraphite-2.3.1/engine/include/graphite/GrCommon.h	2013-05-27 15:10:19.387015800 +0200
40@@ -18,8 +18,8 @@
41 #ifndef GRCOMMON_INCLUDED
42 #define GRCOMMON_INCLUDED
43
44-#define _SECURE_SCL 0	// to allow GlyphSetIterator to work, which points off the end of a vector
45-#define _HAS_ITERATOR_DEBUGGING 0
46+//#define _SECURE_SCL 0	// to allow GlyphSetIterator to work, which points off the end of a vector
47+//#define _HAS_ITERATOR_DEBUGGING 0
48
49 // Standard Headers.
50
51