From: Earnie B. <ea...@us...> - 2001-09-22 17:43:49
|
Update of /cvsroot/mingw/msys/rt/src/winsup/cygwin/include/cygwin In directory usw-pr-cvs1:/tmp/cvs-serv18569/winsup/cygwin/include/cygwin Modified Files: cygwin_dll.h types.h Log Message: Empirical changes for MSYS based on CYGWIN. See ChangeLog for each individual subsystem for details. Index: cygwin_dll.h =================================================================== RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/include/cygwin/cygwin_dll.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** cygwin_dll.h 2001/08/07 17:51:16 1.1.1.1 --- cygwin_dll.h 2001/09/22 17:43:44 1.2 *************** *** 27,32 **** 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 \ \ --- 27,32 ---- int WINAPI Entry (HINSTANCE h, DWORD reason, void *ptr); \ typedef int (*mainfunc) (int, char **, char **); \ ! extern int msys_attach_dll (HMODULE, mainfunc); \ ! extern void msys_detach_dll (DWORD); \ CDECL_END \ \ *************** *** 42,46 **** static DWORD dll_index; \ \ ! int WINAPI _cygwin_dll_entry (HINSTANCE h, DWORD reason, void *ptr) \ { \ int ret; \ --- 42,46 ---- static DWORD dll_index; \ \ ! int WINAPI _msys_dll_entry (HINSTANCE h, DWORD reason, void *ptr) \ { \ int ret; \ *************** *** 54,58 **** storedReason = reason; \ storedPtr = ptr; \ ! dll_index = cygwin_attach_dll (h, &__dllMain); \ if (dll_index == (DWORD) -1) \ ret = 0; \ --- 54,58 ---- storedReason = reason; \ storedPtr = ptr; \ ! dll_index = msys_attach_dll (h, &__dllMain); \ if (dll_index == (DWORD) -1) \ ret = 0; \ *************** *** 65,69 **** if (ret) \ { \ ! cygwin_detach_dll (dll_index); \ dll_index = (DWORD) -1; \ } \ --- 65,69 ---- if (ret) \ { \ ! msys_detach_dll (dll_index); \ dll_index = (DWORD) -1; \ } \ *************** *** 87,93 **** \ /* OBSOLETE: This is only provided for source level compatibility. */ \ ! int WINAPI _cygwin_noncygwin_dll_entry (HINSTANCE h, DWORD reason, void *ptr) \ { \ ! return _cygwin_dll_entry (h, reason, ptr); \ } \ --- 87,93 ---- \ /* OBSOLETE: This is only provided for source level compatibility. */ \ ! int WINAPI _msys_nonmsys_dll_entry (HINSTANCE h, DWORD reason, void *ptr) \ { \ ! return _msys_dll_entry (h, reason, ptr); \ } \ Index: types.h =================================================================== RCS file: /cvsroot/mingw/msys/rt/src/winsup/cygwin/include/cygwin/types.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** types.h 2001/08/07 17:51:16 1.1.1.1 --- types.h 2001/09/22 17:43:44 1.2 *************** *** 18,22 **** #define _CYGWIN_TYPES_H ! #if !defined(__INSIDE_CYGWIN__) || !defined(__cplusplus) typedef void *pthread_t; --- 18,22 ---- #define _CYGWIN_TYPES_H ! #if !(defined(__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__)) || !defined(__cplusplus) typedef void *pthread_t; |