zorba-coders team mailing list archive

[Chris Hillery <chillery+launchpad@xxxxxxxxx>]

Chris Hillery has proposed merging lp:~zorba-coders/zorba/win64-build into lp:zorba.

Requested reviews:
  Zorba Coders (zorba-coders)
Related bugs:
  Bug #1151966 in Zorba: "64-bit support on Windows"
  https://bugs.launchpad.net/zorba/+bug/1151966

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/win64-build/+merge/174890
-- 
https://code.launchpad.net/~zorba-coders/zorba/win64-build/+merge/174890
Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/win64-build into lp:zorba.

=== modified file 'src/debugger/socket.h'
--- src/debugger/socket.h	2013-02-07 17:24:36 +0000
+++ src/debugger/socket.h	2013-07-15 23:03:33 +0000
@@ -21,12 +21,16 @@
 
 #include <zorba/debugger_exception.h>
 
-#ifdef WIN32
+#ifdef _WIN64
+  typedef unsigned __int64 SOCKET;
+#else
+#ifdef _WIN32
   typedef unsigned int __w64 SOCKET;
 #else
 # define INVALID_SOCKET -1
 typedef int SOCKET;
 #endif
+#endif
 
 namespace zorba {