diff options
| -rw-r--r-- | winsup/w32api/ChangeLog | 7 | ||||
| -rwxr-xr-x | winsup/w32api/include/gdiplus/gdiplustypes.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 7b65749df..be0c0b8c2 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,5 +1,12 @@ 2012-01-03 Chris Sutcliffe <ir0nh34d@users.sf.net> + Return value, identified 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/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 */
|