* cygheap.h (init_cygheap): Move heap pointers here.
* include/sys/cygwin.h (perprocess): Remove heap pointers. * dcrt0.cc (__cygwin_user_data): Reflect obsolete perprocess stuff. (_dll_crt0): Don't initialize heap pointers. (cygwin_dll_init): Ditto. (release_upto): Use heap pointers from cygheap. * heap.h: Ditto. * fork.cc (fork_parent): Ditto. Don't set heap pointers in ch. (fork_child): Remove obsolete sigproc_fixup_after_fork. * shared.cc (memory_init): Reorganize so that cygheap initialization is called prior to regular heap since regular heap uses cygheap now. * sigproc.cc (proc_subproc): Eliminate zombies allocation. (sigproc_init): Move zombies alloation here. Don't free up array on fork, just reuse it. (sigproc_fixup_after_fork): Eliminate. * sigproc.h: Ditto. * include/cygwin/version.h: Reflect change to perprocess structure.
This commit is contained in:
@ -268,9 +268,9 @@ wsock_init ()
|
||||
int (*wsastartup) (int, WSADATA *);
|
||||
|
||||
wsastartup = (int (*)(int, WSADATA *))
|
||||
GetProcAddress ((HMODULE) (dll->handle), "WSAStartup");
|
||||
GetProcAddress ((HMODULE) (dll->handle), "WSAStartup");
|
||||
if (wsastartup)
|
||||
{
|
||||
{
|
||||
int res = wsastartup ((2<<8) | 2, &wsadata);
|
||||
|
||||
debug_printf ("res %d", res);
|
||||
@ -283,7 +283,7 @@ wsock_init ()
|
||||
debug_printf ("lpVendorInfo %d", wsadata.lpVendorInfo);
|
||||
|
||||
wsock_started = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
InterlockedDecrement (&here);
|
||||
|
Reference in New Issue
Block a user