--- /dev/null
+--- /d/Program Files (x86)/Microsoft Visual Studio 8/VC/PlatformSDK/include/GdiPlusEnums.h Thu Apr 14 16:54:44 2005
++++ ./GdiPlusEnums.h Mon Feb 25 17:19:13 2008
+@@ -531,11 +531,9 @@
+ // We have to change the WMF record numbers so that they don't conflict with\r
+ // the EMF and EMF+ record numbers.\r
+ \r
+-enum EmfPlusRecordType;\r
+-\r
+ #define GDIP_EMFPLUS_RECORD_BASE 0x00004000\r
+ #define GDIP_WMF_RECORD_BASE 0x00010000\r
+-#define GDIP_WMF_RECORD_TO_EMFPLUS(n) ((EmfPlusRecordType)((n) | GDIP_WMF_RECORD_BASE))\r
++#define GDIP_WMF_RECORD_TO_EMFPLUS(n) ((n) | GDIP_WMF_RECORD_BASE)\r
+ #define GDIP_EMFPLUS_RECORD_TO_WMF(n) ((n) & (~GDIP_WMF_RECORD_BASE))\r
+ #define GDIP_IS_WMF_RECORDTYPE(n) (((n) & GDIP_WMF_RECORD_BASE) != 0)\r
+ \r
--- /dev/null
+--- /d/Program Files (x86)/Microsoft Visual Studio 8/VC/PlatformSDK/include/GdiPlusHeaders.h Thu Apr 14 16:54:44 2005
++++ ./GdiPlusHeaders.h Mon Feb 25 17:20:22 2008
+@@ -650,7 +650,7 @@
+ \r
+ class CachedBitmap : public GdiplusBase\r
+ {\r
+- friend Graphics;\r
++ friend class Graphics;\r
+ \r
+ public:\r
+ CachedBitmap(IN Bitmap *bitmap,\r
--- /dev/null
+--- /d/Program Files (x86)/Microsoft Visual Studio 8/VC/PlatformSDK/include/GdiPlusImaging.h Thu Apr 14 16:54:44 2005
++++ ./GdiPlusImaging.h Mon Feb 25 17:23:08 2008
+@@ -153,7 +153,7 @@
+ UINT Width;\r
+ UINT Height;\r
+ INT Stride;\r
+- PixelFormat PixelFormat;\r
++ Gdiplus::PixelFormat PixelFormat;\r
+ VOID* Scan0;\r
+ UINT_PTR Reserved;\r
+ };\r
--- /dev/null
+--- /d/Program Files (x86)/Microsoft Visual Studio 8/VC/PlatformSDK/include/GdiPlusimageAttributes.h Thu Apr 14 16:54:44 2005
++++ ./GdiPlusimageAttributes.h Mon Feb 25 17:21:58 2008
+@@ -231,8 +231,8 @@
+ nativeImageAttr,\r
+ type,\r
+ FALSE,\r
+- NULL,\r
+- NULL));\r
++ (ARGB)0,\r
++ (ARGB)0));\r
+ }\r
+ \r
+ Status SetOutputChannel(\r