Merge remote-tracking branch 'origin/patches-2.0'

This commit is contained in:
Nick Mathewson 2013-11-01 14:21:54 -04:00
commit a60632a1ec

View File

@ -142,6 +142,8 @@ get_extension_function(SOCKET s, const GUID *which_fn)
{0xb5367df2,0xcbac,0x11cf,{0x95,0xca,0x00,0x80,0x5f,0x48,0xa1,0x92}}
#endif
static int extension_fns_initialized = 0;
static void
init_extension_functions(struct win32_extension_fns *ext)
{
@ -156,10 +158,11 @@ init_extension_functions(struct win32_extension_fns *ext)
ext->GetAcceptExSockaddrs = get_extension_function(s,
&getacceptexsockaddrs);
closesocket(s);
extension_fns_initialized = 1;
}
static struct win32_extension_fns the_extension_fns;
static int extension_fns_initialized = 0;
const struct win32_extension_fns *
event_get_win32_extension_fns_(void)