From 02991f75ce429390314ef183c6a77af7aa000c39 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sat, 11 Feb 2017 18:55:32 +0100 Subject: Revert "move winsock specific stuff into dllmain" This reverts commit d94c2c796a1b032d53b382681f8413cc3d02d2da. WSA functions are documented explicitly as unsafe for dllmain --- win32/dllmain.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'win32/dllmain.c') diff --git a/win32/dllmain.c b/win32/dllmain.c index 2e5151dcf9..1c34fb1b26 100644 --- a/win32/dllmain.c +++ b/win32/dllmain.c @@ -40,9 +40,6 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID dummy) switch (reason) { case DLL_PROCESS_ATTACH: - WORD wVersionRequested = MAKEWORD(2, 0); - WSADATA wsaData; - /* * We do not need to check the return value of php_win32_init_gettimeofday() * because the symbol bare minimum symbol we need is always available on our @@ -62,18 +59,12 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID dummy) fprintf(stderr, "ioutil initialization failed"); return ret; } - - ret = ret && (0 == WSAStartup(wVersionRequested, &wsaData)); - if (!ret) { - fprintf(stderr, "winsock initialization failed %d", WSAGetLastError()); - return ret; - } break; +#if 0 /* prepared */ case DLL_PROCESS_DETACH: - WSACleanup(); + /* pass */ break; -#if 0 /* prepared */ case DLL_THREAD_ATTACH: /* pass */ break; -- cgit v1.2.1