* include/winnt.h (PVOID): Move to before HANDLE typedef.

	* include/winuser.h (mouse_event): Correct type of fifth param,
	Thanks to: Andrew Jones <guln at users dot sourceforge dot net>

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 7b3c6be9e7ebdce87e16d37149fd89e51342833a..ac6ff4cafe7574aff91acee2ca2a71344b9c9a48 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,10 @@
+2003-07-12  Danny Smith  <dannysmith@users.sourceforge.net>
+
+       * include/winnt.h (PVOID): Move to before HANDLE typedef.
+
+       * include/winuser.h (mouse_event): Correct type of fifth param,
+       Thanks to: Andrew Jones <guln at users dot sourceforge dot net>
+
 2003-07-11  Earnie Boyd  <earnie@users.sf.net>
 
        * include/winnt.h (HANDLE): Define based on STRICT filter.

diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h
index 93a476487ac450e9bfa22d39fb8956193b91a938..1b3262afef337eb6fa08ed33b9a77307355e0ae5 100644 (file)
--- a/winsup/w32api/include/winnt.h
+++ b/winsup/w32api/include/winnt.h
@@ -116,7 +116,6 @@ typedef const TCHAR *LPCTSTR;
 #define TEXT(q) __TEXT(q)    
 typedef SHORT *PSHORT;
 typedef LONG *PLONG;
-typedef HANDLE *PHANDLE,*LPHANDLE;
 #ifdef STRICT
 typedef void *HANDLE;
 #define DECLARE_HANDLE(n) typedef struct n##__{int i;}*n
@@ -124,6 +123,7 @@ typedef void *HANDLE;
 typedef PVOID HANDLE;
 #define DECLARE_HANDLE(n) typedef HANDLE n
 #endif
+typedef HANDLE *PHANDLE,*LPHANDLE;
 typedef DWORD LCID;
 typedef PDWORD PLCID;
 typedef WORD LANGID;

diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h
index 8a9b27dfaa0e1a8d1a6d7e355464196126281ae8..fc49831ae7b5eef425f8cf2bc8ae4113dba3b97a 100644 (file)
--- a/winsup/w32api/include/winuser.h
+++ b/winsup/w32api/include/winuser.h
@@ -3186,7 +3186,7 @@ int WINAPI MessageBoxIndirectA(CONST MSGBOXPARAMSA*);
 int WINAPI MessageBoxIndirectW(CONST MSGBOXPARAMSW*);
 BOOL WINAPI ModifyMenuA(HMENU,UINT,UINT,UINT,LPCSTR);
 BOOL WINAPI ModifyMenuW(HMENU,UINT,UINT,UINT,LPCWSTR);
-void WINAPI mouse_event(DWORD,DWORD,DWORD,DWORD,DWORD);
+void WINAPI mouse_event(DWORD,DWORD,DWORD,DWORD,ULONG_PTR);
 BOOL WINAPI MoveWindow(HWND,int,int,int,int,BOOL);
 DWORD WINAPI MsgWaitForMultipleObjects(DWORD,CONST HANDLE*,BOOL,DWORD,DWORD);
 DWORD WINAPI MsgWaitForMultipleObjectsEx(DWORD,CONST HANDLE*,DWORD,DWORD,DWORD);