Rev 3846: (bialix) Use Winsock2.h to match the Ws2 library. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3846
revision-id: pqm at pqm.ubuntu.com-20081121202743-dhg79sf8sf0wryfe
parent: pqm at pqm.ubuntu.com-20081121044450-xgyehkv3u1da37wg
parent: john at arbash-meinel.com-20081121195345-6vfpy3821ge662vk
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-11-21 20:27:43 +0000
message:
  (bialix) Use Winsock2.h to match the Ws2 library.
modified:
  bzrlib/python-compat.h         pythoncompat.h-20080924041409-9kvi0fgtuuqp743j-1
    ------------------------------------------------------------
    revno: 3842.1.1
    revision-id: john at arbash-meinel.com-20081121195345-6vfpy3821ge662vk
    parent: pqm at pqm.ubuntu.com-20081120045730-d6ik8z5dfnzcnab6
    author: Alexander Belchenko <bialix at ukr.net>
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Fri 2008-11-21 13:53:45 -0600
    message:
      include Winsock2.h to match the Ws2 library.
    modified:
      bzrlib/python-compat.h         pythoncompat.h-20080924041409-9kvi0fgtuuqp743j-1
=== modified file 'bzrlib/python-compat.h'
--- a/bzrlib/python-compat.h	2008-10-21 15:53:56 +0000
+++ b/bzrlib/python-compat.h	2008-11-21 19:53:45 +0000
@@ -42,7 +42,7 @@
     #include <windows.h>
 
     /* Needed for htonl */
-    #include "Winsock.h"
+    #include "Winsock2.h"
 
     /* sys/stat.h doesn't have any of these macro definitions for MSVC, so
      * we'll define whatever is missing that we actually use.