Re-Map ExpandEnvironmentStrings and GdiFlush

build/wince/shunt/include/mozce_shunt.h

@@ -352,6 +352,11 @@
 #endif
 #define ExtSelectClipRgn          mozce_ExtSelectClipRgn
 
+#ifdef ExpandEnvironmentStrings
+#undef ExpandEnvironmentStrings
+#endif
+#define ExpandEnvironmentStrings  mozce_ExpandEnvironmentStrings
+
 #ifdef FIXED
 #undef FIXED
 #endif
@@ -367,6 +372,11 @@
 #endif
 #define FrameRect                 mozce_FrameRect
 
+#ifdef GdiFlush
+#undef GdiFlush
+#endif
+#define GdiFlush                 mozce_GdiFlush
+
 #ifdef GLYPHMETRICS
 #undef GLYPHMETRICS
 #endif