* include/cygwin/cygwin_dll.h (DECLARE_CYGWIN_DLL): hinstance,

not handle. (reverse of previous diff)

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 9257ac3c9d58d86dd5d719faddc93a21331c28d7..03dccdffce463b5dde7dbf89c80f60697fae2a75 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,7 +1,7 @@
 2000-08-21  DJ Delorie  <dj@redhat.com>
 
-       * 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 <corinna@vinschen.de>
 

diff --git a/winsup/cygwin/include/cygwin/cygwin_dll.h b/winsup/cygwin/include/cygwin/cygwin_dll.h
index 18378da5e7337ae1fbdb339e16d354ab1d77d15b..88679b0c9a486f9713a751c3446afbfcacd22ce0 100644 (file)
--- 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);                                 \
 }                                                                            \