1 diff -urN libssh2-0.18.orig/example/simple/scp.c libssh2-0.18.mingw/example/simple/scp.c
2 --- libssh2-0.18.orig/example/simple/scp.c 2007-08-12 22:39:55.000000000 +0100
3 +++ libssh2-0.18.mingw/example/simple/scp.c 2008-11-10 14:18:13.000000000 +0000
8 - WSAStartup(WINSOCK_VERSION, &wsadata);
9 + WSAStartup(MAKEWORD(2,0), &wsadata);
13 diff -urN libssh2-0.18.orig/example/simple/scp_nonblock.c libssh2-0.18.mingw/example/simple/scp_nonblock.c
14 --- libssh2-0.18.orig/example/simple/scp_nonblock.c 2007-09-24 13:15:45.000000000 +0100
15 +++ libssh2-0.18.mingw/example/simple/scp_nonblock.c 2008-11-10 14:22:21.000000000 +0000
20 - WSAStartup(WINSOCK_VERSION, &wsadata);
21 + WSAStartup(MAKEWORD(2,0), &wsadata);
25 diff -urN libssh2-0.18.orig/example/simple/scp_write.c libssh2-0.18.mingw/example/simple/scp_write.c
26 --- libssh2-0.18.orig/example/simple/scp_write.c 2007-08-12 22:39:56.000000000 +0100
27 +++ libssh2-0.18.mingw/example/simple/scp_write.c 2008-11-10 14:19:32.000000000 +0000
32 - WSAStartup(WINSOCK_VERSION, &wsadata);
33 + WSAStartup(MAKEWORD(2,0), &wsadata);
37 diff -urN libssh2-0.18.orig/example/simple/scp_write_nonblock.c libssh2-0.18.mingw/example/simple/scp_write_nonblock.c
38 --- libssh2-0.18.orig/example/simple/scp_write_nonblock.c 2007-08-12 22:39:56.000000000 +0100
39 +++ libssh2-0.18.mingw/example/simple/scp_write_nonblock.c 2008-11-10 14:22:13.000000000 +0000
44 - WSAStartup(WINSOCK_VERSION, &wsadata);
45 + WSAStartup(MAKEWORD(2,0), &wsadata);
49 diff -urN libssh2-0.18.orig/example/simple/sftp.c libssh2-0.18.mingw/example/simple/sftp.c
50 --- libssh2-0.18.orig/example/simple/sftp.c 2007-09-24 13:14:18.000000000 +0100
51 +++ libssh2-0.18.mingw/example/simple/sftp.c 2008-11-10 14:15:47.000000000 +0000
56 - WSAStartup(WINSOCK_VERSION, &wsadata);
57 + WSAStartup(MAKEWORD(2,0), &wsadata);
61 diff -urN libssh2-0.18.orig/example/simple/sftpdir.c libssh2-0.18.mingw/example/simple/sftpdir.c
62 --- libssh2-0.18.orig/example/simple/sftpdir.c 2007-08-12 22:39:56.000000000 +0100
63 +++ libssh2-0.18.mingw/example/simple/sftpdir.c 2008-11-10 14:18:41.000000000 +0000
68 - WSAStartup(WINSOCK_VERSION, &wsadata);
69 + WSAStartup(MAKEWORD(2,0), &wsadata);
73 diff -urN libssh2-0.18.orig/example/simple/sftpdir_nonblock.c libssh2-0.18.mingw/example/simple/sftpdir_nonblock.c
74 --- libssh2-0.18.orig/example/simple/sftpdir_nonblock.c 2007-08-12 22:39:56.000000000 +0100
75 +++ libssh2-0.18.mingw/example/simple/sftpdir_nonblock.c 2008-11-10 14:23:35.000000000 +0000
80 - WSAStartup(WINSOCK_VERSION, &wsadata);
81 + WSAStartup(MAKEWORD(2,0), &wsadata);
85 diff -urN libssh2-0.18.orig/example/simple/sftp_mkdir.c libssh2-0.18.mingw/example/simple/sftp_mkdir.c
86 --- libssh2-0.18.orig/example/simple/sftp_mkdir.c 2007-08-12 22:39:56.000000000 +0100
87 +++ libssh2-0.18.mingw/example/simple/sftp_mkdir.c 2008-11-10 14:18:33.000000000 +0000
92 - WSAStartup(WINSOCK_VERSION, &wsadata);
93 + WSAStartup(MAKEWORD(2,0), &wsadata);
97 diff -urN libssh2-0.18.orig/example/simple/sftp_mkdir_nonblock.c libssh2-0.18.mingw/example/simple/sftp_mkdir_nonblock.c
98 --- libssh2-0.18.orig/example/simple/sftp_mkdir_nonblock.c 2007-08-12 22:39:56.000000000 +0100
99 +++ libssh2-0.18.mingw/example/simple/sftp_mkdir_nonblock.c 2008-11-10 14:23:03.000000000 +0000
104 - WSAStartup(WINSOCK_VERSION, &wsadata);
105 + WSAStartup(MAKEWORD(2,0), &wsadata);
109 diff -urN libssh2-0.18.orig/example/simple/sftp_nonblock.c libssh2-0.18.mingw/example/simple/sftp_nonblock.c
110 --- libssh2-0.18.orig/example/simple/sftp_nonblock.c 2007-08-12 22:39:56.000000000 +0100
111 +++ libssh2-0.18.mingw/example/simple/sftp_nonblock.c 2008-11-10 14:22:30.000000000 +0000
116 - WSAStartup(WINSOCK_VERSION, &wsadata);
117 + WSAStartup(MAKEWORD(2,0), &wsadata);
121 diff -urN libssh2-0.18.orig/example/simple/sftp_RW_nonblock.c libssh2-0.18.mingw/example/simple/sftp_RW_nonblock.c
122 --- libssh2-0.18.orig/example/simple/sftp_RW_nonblock.c 2007-08-12 22:39:56.000000000 +0100
123 +++ libssh2-0.18.mingw/example/simple/sftp_RW_nonblock.c 2008-11-10 14:23:18.000000000 +0000
128 - WSAStartup(WINSOCK_VERSION, &wsadata);
129 + WSAStartup(MAKEWORD(2,0), &wsadata);
132 /* Ultra basic "connect to port 22 on localhost"
133 diff -urN libssh2-0.18.orig/example/simple/sftp_write.c libssh2-0.18.mingw/example/simple/sftp_write.c
134 --- libssh2-0.18.orig/example/simple/sftp_write.c 2007-08-12 22:39:56.000000000 +0100
135 +++ libssh2-0.18.mingw/example/simple/sftp_write.c 2008-11-10 14:19:09.000000000 +0000
140 - WSAStartup(WINSOCK_VERSION, &wsadata);
141 + WSAStartup(MAKEWORD(2,0), &wsadata);
145 diff -urN libssh2-0.18.orig/example/simple/sftp_write_nonblock.c libssh2-0.18.mingw/example/simple/sftp_write_nonblock.c
146 --- libssh2-0.18.orig/example/simple/sftp_write_nonblock.c 2007-08-12 22:39:56.000000000 +0100
147 +++ libssh2-0.18.mingw/example/simple/sftp_write_nonblock.c 2008-11-10 14:22:44.000000000 +0000
152 - WSAStartup(WINSOCK_VERSION, &wsadata);
153 + WSAStartup(MAKEWORD(2,0), &wsadata);
157 diff -urN libssh2-0.18.orig/example/simple/ssh2.c libssh2-0.18.mingw/example/simple/ssh2.c
158 --- libssh2-0.18.orig/example/simple/ssh2.c 2007-08-12 22:39:56.000000000 +0100
159 +++ libssh2-0.18.mingw/example/simple/ssh2.c 2008-11-10 14:14:32.000000000 +0000
164 - WSAStartup(WINSOCK_VERSION, &wsadata);
165 + WSAStartup(MAKEWORD(2,0), &wsadata);
169 diff -urN libssh2-0.18.orig/win32/libssh2_config.h libssh2-0.18.mingw/win32/libssh2_config.h
170 --- libssh2-0.18.orig/win32/libssh2_config.h 2007-07-28 23:59:22.000000000 +0100
171 +++ libssh2-0.18.mingw/win32/libssh2_config.h 2008-11-10 14:15:24.000000000 +0000
173 #define strncasecmp _strnicmp
174 #define strcasecmp _stricmp
177 -#define WINSOCK_VERSION MAKEWORD(2,0)
180 #define strncasecmp strnicmp
181 #define strcasecmp stricmp
182 -#endif /* __MINGW32__ */
183 +#endif /* !__MINGW32__ */
184 #endif /* _MSC_VER */
186 /* Compile in zlib support */