From 70284e10d07ace8b645a0f34152038b166443ad6 Mon Sep 17 00:00:00 2001 From: Chris Sutcliffe Date: Wed, 4 Jan 2012 02:32:08 +0000 Subject: [PATCH] 2012-01-03 Chris Sutcliffe Return value, identified by 'make test'. * include/gdiplus/gdiplustypes.h (Gdiplus::GdiplusAbort::Abort()): Return NO_ERROR in virtual definition. --- winsup/w32api/ChangeLog | 7 +++++++ winsup/w32api/include/gdiplus/gdiplustypes.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 7b65749df..be0c0b8c2 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,10 @@ +2012-01-03 Chris Sutcliffe + + Return value, identified by 'make test'. + + * include/gdiplus/gdiplustypes.h (Gdiplus::GdiplusAbort::Abort()): Return + NO_ERROR in virtual definition. + 2012-01-03 Chris Sutcliffe Remove duplicate definitions, identified by 'make test'. diff --git a/winsup/w32api/include/gdiplus/gdiplustypes.h b/winsup/w32api/include/gdiplus/gdiplustypes.h index 9ac8de5b5..67d7e59da 100755 --- a/winsup/w32api/include/gdiplus/gdiplustypes.h +++ b/winsup/w32api/include/gdiplus/gdiplustypes.h @@ -404,7 +404,7 @@ typedef struct RectF { binary compatible with MSVC++ code (especially GDIPLUS.DLL of course)? */ #ifdef __cplusplus struct GdiplusAbort { - virtual HRESULT __stdcall Abort(void) {} + virtual HRESULT __stdcall Abort(void) { return NO_ERROR; } }; #else typedef struct GdiplusAbort GdiplusAbort; /* incomplete type */