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

diff --cc event_iocp.c
index c69946c4961d358d283685c8875217496389d2a3,9648366d8d868d447e67cc89a7426fe3a61eabb5..a9902fbc426ee59853506d5513671edafe70c18e
--- 1/event_iocp.c
--- 2/event_iocp.c
+++ b/event_iocp.c
@@@ -159,10 -162,9 +163,9 @@@ init_extension_functions(struct win32_e
  }
  
  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)
 +event_get_win32_extension_fns_(void)
  {
        return &the_extension_fns;
  }