compile on latest MSVC

Signed-off-by: LIU Hao <lh_mouse@126.com>

mingw-w64-headers/include/gdiplus/gdiplusinit.h

diff --git a/mingw-w64-headers/include/gdiplus/gdiplusinit.h b/mingw-w64-headers/include/gdiplus/gdiplusinit.h
index e9276a6..983b5de 100644
--- a/mingw-w64-headers/include/gdiplus/gdiplusinit.h
+++ b/mingw-w64-headers/include/gdiplus/gdiplusinit.h
@@ -43,8 +43,8 @@
 	#endif /* __cplusplus */
 } GdiplusStartupInput;
 
-typedef GpStatus WINGDIPAPI (*NotificationHookProc)(ULONG_PTR *token);
-typedef VOID WINGDIPAPI (*NotificationUnhookProc)(ULONG_PTR token);
+typedef GpStatus (WINGDIPAPI *NotificationHookProc)(ULONG_PTR *token);
+typedef VOID (WINGDIPAPI *NotificationUnhookProc)(ULONG_PTR token);
 
 typedef struct GdiplusStartupOutput {
 	NotificationHookProc NotificationHook;

mingw-w64-headers/include/gdiplus/gdiplustypes.h

diff --git a/mingw-w64-headers/include/gdiplus/gdiplustypes.h b/mingw-w64-headers/include/gdiplus/gdiplustypes.h
index 68d522a..801122d 100644
--- a/mingw-w64-headers/include/gdiplus/gdiplustypes.h
+++ b/mingw-w64-headers/include/gdiplus/gdiplustypes.h
@@ -450,9 +450,8 @@
 } PathData;
 
 /* Callback function types */
-/* FIXME: need a correct definition for these function pointer types */
 typedef void *DebugEventProc;
-typedef BOOL CALLBACK (*EnumerateMetafileProc)(EmfPlusRecordType,UINT,UINT,const BYTE*,VOID*);
+typedef BOOL (CALLBACK *EnumerateMetafileProc)(EmfPlusRecordType,UINT,UINT,const BYTE*,VOID*);
 typedef void *DrawImageAbort;
 typedef void *GetThumbnailImageAbort;