Zorba

Merge lp:~zorba-coders/zorba/win64-build into lp:zorba

  1. win64-build
  2. Merge into trunk
Proposed by Chris Hillery
Status: Merged
Merged at revision: 11587
Proposed branch: lp:~zorba-coders/zorba/win64-build
Merge into: lp:zorba
Diff against target: 20 lines (+5/-1)
1 file modified
src/debugger/socket.h (+5/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/win64-build
Reviewer Review Type Date Requested Status
Juan Zacarias Approve
Chris Hillery Approve
Review via email: mp+174890@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Juan Zacarias (juan457) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/debugger/socket.h'
2--- src/debugger/socket.h 2013-02-07 17:24:36 +0000
3+++ src/debugger/socket.h 2013-07-15 23:03:33 +0000
4@@ -21,12 +21,16 @@
5
6 #include <zorba/debugger_exception.h>
7
8-#ifdef WIN32
9+#ifdef _WIN64
10+ typedef unsigned __int64 SOCKET;
11+#else
12+#ifdef _WIN32
13 typedef unsigned int __w64 SOCKET;
14 #else
15 # define INVALID_SOCKET -1
16 typedef int SOCKET;
17 #endif
18+#endif
19
20 namespace zorba {
21

Subscribers

People subscribed via source and target branches