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

Conflicts:
	evthread_win32.c
	listener.c

diff --cc event_iocp.c
index fbeda703acac46042a22cede8bf95e8e1542f3f0,75fe4627eb00c6df3c25bb5ac72ed4e8d73250c7..26ad64f2628040a61d46b5a4e33a9ab85315568b
--- 1/event_iocp.c
--- 2/event_iocp.c
+++ b/event_iocp.c
@@@ -23,8 -23,11 +23,12 @@@
   * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
 +#include "evconfig-private.h"
  
+ #ifndef _WIN32_WINNT
+ /* Minimum required for InitializeCriticalSectionAndSpinCount */
+ #define _WIN32_WINNT 0x0403
+ #endif
  #include <winsock2.h>
  #include <windows.h>
  #include <process.h>

diff --cc evthread_win32.c
index 7bb97bf96bffc7cacb6b28d31d2b4efa8467ec25,18dca6d4391a8c0c69dba59874d5337c8879808c..2dcd70c2022fcc97be1367fae0fdd1e7426fc745
--- 1/evthread_win32.c
--- 2/evthread_win32.c
+++ b/evthread_win32.c
@@@ -24,9 -24,12 +24,13 @@@
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  #include "event2/event-config.h"
 +#include "evconfig-private.h"
  
 -#ifdef WIN32
 +#ifdef _WIN32
+ #ifndef _WIN32_WINNT
+ /* Minimum required for InitializeCriticalSectionAndSpinCount */
+ #define _WIN32_WINNT 0x0403
+ #endif
  #include <winsock2.h>
  #define WIN32_LEAN_AND_MEAN
  #include <windows.h>

diff --cc listener.c
index aaceaae742a53bb5b8e0ada4a2e7f3310aaa9b66,5db2cb733b313a7945aeb82ccfcdb2fdba63d3d4..7f80338288b8ae265467b5b5e75c57ab66a2d4b1
--- 1/listener.c
--- 2/listener.c
+++ b/listener.c
@@@ -24,12 -24,15 +24,16 @@@
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
 -#include <sys/types.h>
 -
  #include "event2/event-config.h"
 +#include "evconfig-private.h"
 +
 +#include <sys/types.h>
  
 -#ifdef WIN32
 +#ifdef _WIN32
+ #ifndef _WIN32_WINNT
+ /* Minimum required for InitializeCriticalSectionAndSpinCount */
+ #define _WIN32_WINNT 0x0403
+ #endif
  #include <winsock2.h>
  #include <ws2tcpip.h>
  #include <mswsock.h>