From d3bff3131f70b9c76415c508ac2a01efb87a1bcb Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Mon, 21 Aug 2000 18:15:50 +0000 Subject: [PATCH] * include/cygwin/cygwin_dll.h (DECLARE_CYGWIN_DLL): hinstance, not handle. (reverse of previous diff) --- winsup/cygwin/ChangeLog | 4 ++-- winsup/cygwin/include/cygwin/cygwin_dll.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 9257ac3c9..03dccdffc 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,7 +1,7 @@ 2000-08-21 DJ Delorie - * include/cygwin/cygwin_dll.h (DECLARE_CYGWIN_DLL): handle, - not hinstance. + * include/cygwin/cygwin_dll.h (DECLARE_CYGWIN_DLL): hinstance, + not handle. Fri Aug 18 11:11:00 2000 Corinna Vinschen diff --git a/winsup/cygwin/include/cygwin/cygwin_dll.h b/winsup/cygwin/include/cygwin/cygwin_dll.h index 18378da5e..88679b0c9 100644 --- a/winsup/cygwin/include/cygwin/cygwin_dll.h +++ b/winsup/cygwin/include/cygwin/cygwin_dll.h @@ -24,13 +24,13 @@ details. */ #define DECLARE_CYGWIN_DLL(Entry) \ \ CDECL_BEGIN \ - int WINAPI Entry (HANDLE h, DWORD reason, void *ptr); \ + int WINAPI Entry (HINSTANCE h, DWORD reason, void *ptr); \ typedef int (*mainfunc) (int, char **, char **); \ extern int cygwin_attach_dll (HMODULE, mainfunc); \ extern void cygwin_detach_dll (DWORD); \ CDECL_END \ \ -static HANDLE storedHandle; \ +static HINSTANCE storedHandle; \ static DWORD storedReason; \ static void* storedPtr; \ \ @@ -41,7 +41,7 @@ static int __dllMain (int a, char **b, char **c) \ \ static DWORD dll_index; \ \ -int WINAPI _cygwin_dll_entry (HANDLE h, DWORD reason, void *ptr) \ +int WINAPI _cygwin_dll_entry (HINSTANCE h, DWORD reason, void *ptr) \ { \ int ret; \ ret = 1; \ @@ -86,7 +86,7 @@ int WINAPI _cygwin_dll_entry (HANDLE h, DWORD reason, void *ptr) \ } \ \ /* OBSOLETE: This is only provided for source level compatibility. */ \ -int WINAPI _cygwin_noncygwin_dll_entry (HANDLE h, DWORD reason, void *ptr) \ +int WINAPI _cygwin_noncygwin_dll_entry (HINSTANCE h, DWORD reason, void *ptr) \ { \ return _cygwin_dll_entry (h, reason, ptr); \ } \