Add missing return value, flagged by 'make test'.

diff --git a/w32api/ChangeLog b/w32api/ChangeLog
index 2ad278e..db410c2 100644 (file)
--- a/w32api/ChangeLog
+++ b/w32api/ChangeLog
@@ -1,5 +1,12 @@
 2012-01-03  Chris Sutcliffe  <ir0nh34d@users.sf.net>
 
+       Add missing return value, flagged by 'make test'.
+
+       * include/gdiplus/gdiplustypes.h (Gdiplus::GdiplusAbort::Abort):
+       Return NO_ERROR in virtual definition.
+
+2012-01-03  Chris Sutcliffe  <ir0nh34d@users.sf.net>
+
        Remove duplicate definitions, identified by 'make test'.
 
        * include/wincrypt.h (CRYPT_NEWKEYSET, CRYPT_DELETEKEYSET)

diff --git a/w32api/include/gdiplus/gdiplustypes.h b/w32api/include/gdiplus/gdiplustypes.h
index 9ac8de5..67d7e59 100644 (file)
--- a/w32api/include/gdiplus/gdiplustypes.h
+++ b/w32api/include/gdiplus/gdiplustypes.h
@@ -404,7 +404,7 @@ typedef struct RectF {
    binary compatible with MSVC++ code (especially GDIPLUS.DLL of course)? */\r
 #ifdef __cplusplus\r
 struct GdiplusAbort {\r
-       virtual HRESULT __stdcall Abort(void) {}\r
+       virtual HRESULT __stdcall Abort(void) { return NO_ERROR; }\r
 };\r
 #else\r
 typedef struct GdiplusAbort GdiplusAbort;  /* incomplete type */\r