From 4594048d19090b97df5bcada66976a263960cf6e Mon Sep 17 00:00:00 2001 From: Chris Sutcliffe Date: Wed, 25 Aug 2010 23:39:29 +0000 Subject: [PATCH] 2010-08-25 Chris Sutcliffe * include/winuser.h (HHOOK): Move definition from here... * include/windef.h: ...to here, as per MSDN. --- winsup/w32api/ChangeLog | 5 +++++ winsup/w32api/include/windef.h | 1 + winsup/w32api/include/winuser.h | 1 - 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 97ec4cf45..9e3f55984 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,8 @@ +2010-08-25 Chris Sutcliffe + + * include/winuser.h (HHOOK): Move definition from here... + * include/windef.h: ...to here, as per MSDN. + 2010-08-25 Chris Sutcliffe * include/winbase.h (GetEnvironmentStrings, GetEnvironmentStringsA): Per diff --git a/winsup/w32api/include/windef.h b/winsup/w32api/include/windef.h index 793591cb2..c02945eec 100644 --- a/winsup/w32api/include/windef.h +++ b/winsup/w32api/include/windef.h @@ -262,6 +262,7 @@ typedef LONG HRESULT; #ifndef XFree86Server typedef WORD ATOM; #endif /* XFree86Server */ +typedef HANDLE HHOOK; typedef HANDLE HGLOBAL; typedef HANDLE HLOCAL; typedef HANDLE GLOBALHANDLE; diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h index 29b787048..cffde9fe4 100644 --- a/winsup/w32api/include/winuser.h +++ b/winsup/w32api/include/winuser.h @@ -2514,7 +2514,6 @@ typedef NAMEENUMPROCW DESKTOPENUMPROCW; typedef NAMEENUMPROCA WINSTAENUMPROCA; typedef NAMEENUMPROCW WINSTAENUMPROCW; typedef void(CALLBACK *SENDASYNCPROC)(HWND,UINT,DWORD,LRESULT); -DECLARE_HANDLE(HHOOK); DECLARE_HANDLE(HDWP); DECLARE_HANDLE(HDEVNOTIFY); typedef struct tagMENUGETOBJECTINFO {