[pypy-commit] pypy win64-stage1: merge

[mattip]

Author: mattip
Branch: win64-stage1
Changeset: r53846:350196b36b4c
Date: 2012-03-20 23:24 +0200
http://bitbucket.org/pypy/pypy/changeset/350196b36b4c/

Log:	merge

diff --git a/pypy/rlib/_rsocket_rffi.py b/pypy/rlib/_rsocket_rffi.py
--- a/pypy/rlib/_rsocket_rffi.py
+++ b/pypy/rlib/_rsocket_rffi.py
@@ -58,12 +58,12 @@
     header_lines = [
         '#include <WinSock2.h>',
         '#include <WS2tcpip.h>',
+        '#include <Mstcpip.h>',
         # winsock2 defines AF_UNIX, but not sockaddr_un
         '#undef AF_UNIX',
         ]
     if _MSVC:
         header_lines.extend([
-            '#include <Mstcpip.h>',
             # these types do not exist on microsoft compilers
             'typedef int ssize_t;',
             'typedef unsigned __int16 uint16_t;',
@@ -71,6 +71,7 @@
             ])
     else: # MINGW
         includes = ('stdint.h',)
+        """
         header_lines.extend([
             '''\
             #ifndef _WIN32_WINNT
@@ -88,6 +89,7 @@
                 u_long  keepaliveinterval;
             };'''
             ])
+        """
     HEADER = '\n'.join(header_lines)
     COND_HEADER = ''
 constants = {}