libssh2/libssh2-05-remove-WINSOCK-VERSION.patch

   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
   4 @@ -50,7 +50,7 @@
   5  #ifdef WIN32
   6      WSADATA wsadata;
   7
   8 -    WSAStartup(WINSOCK_VERSION, &wsadata);
   9 +    WSAStartup(MAKEWORD(2,0), &wsadata);
  10  #endif
  11
  12      if (argc > 1) {
  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
  16 @@ -50,7 +50,7 @@
  17  #ifdef WIN32
  18      WSADATA wsadata;
  19
  20 -    WSAStartup(WINSOCK_VERSION, &wsadata);
  21 +    WSAStartup(MAKEWORD(2,0), &wsadata);
  22  #endif
  23
  24      if (argc > 1) {
  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
  28 @@ -54,7 +54,7 @@
  29  #ifdef WIN32
  30      WSADATA wsadata;
  31
  32 -    WSAStartup(WINSOCK_VERSION, &wsadata);
  33 +    WSAStartup(MAKEWORD(2,0), &wsadata);
  34  #endif
  35
  36      if (argc > 1) {
  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
  40 @@ -55,7 +55,7 @@
  41  #ifdef WIN32
  42      WSADATA wsadata;
  43
  44 -    WSAStartup(WINSOCK_VERSION, &wsadata);
  45 +    WSAStartup(MAKEWORD(2,0), &wsadata);
  46  #endif
  47
  48      if (argc > 1) {
  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
  52 @@ -80,7 +80,7 @@
  53  #ifdef WIN32
  54      WSADATA wsadata;
  55
  56 -    WSAStartup(WINSOCK_VERSION, &wsadata);
  57 +    WSAStartup(MAKEWORD(2,0), &wsadata);
  58  #endif
  59
  60      if (argc > 1) {
  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
  64 @@ -52,7 +52,7 @@
  65  #ifdef WIN32
  66      WSADATA wsadata;
  67
  68 -    WSAStartup(WINSOCK_VERSION, &wsadata);
  69 +    WSAStartup(MAKEWORD(2,0), &wsadata);
  70  #endif
  71
  72      if (argc > 1) {
  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
  76 @@ -52,7 +52,7 @@
  77  #ifdef WIN32
  78      WSADATA wsadata;
  79
  80 -    WSAStartup(WINSOCK_VERSION, &wsadata);
  81 +    WSAStartup(MAKEWORD(2,0), &wsadata);
  82  #endif
  83
  84      if (argc > 1) {
  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
  88 @@ -51,7 +51,7 @@
  89  #ifdef WIN32
  90      WSADATA wsadata;
  91
  92 -    WSAStartup(WINSOCK_VERSION, &wsadata);
  93 +    WSAStartup(MAKEWORD(2,0), &wsadata);
  94  #endif
  95
  96      if (argc > 1) {
  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
 100 @@ -51,7 +51,7 @@
 101  #ifdef WIN32
 102      WSADATA wsadata;
 103
 104 -    WSAStartup(WINSOCK_VERSION, &wsadata);
 105 +    WSAStartup(MAKEWORD(2,0), &wsadata);
 106  #endif
 107
 108      if (argc > 1) {
 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
 112 @@ -55,7 +55,7 @@
 113  #ifdef WIN32
 114      WSADATA wsadata;
 115
 116 -    WSAStartup(WINSOCK_VERSION, &wsadata);
 117 +    WSAStartup(MAKEWORD(2,0), &wsadata);
 118  #endif
 119
 120      if (argc > 1) {
 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
 124 @@ -63,7 +63,7 @@
 125  #ifdef WIN32
 126      WSADATA wsadata;
 127
 128 -    WSAStartup(WINSOCK_VERSION, &wsadata);
 129 +    WSAStartup(MAKEWORD(2,0), &wsadata);
 130  #endif
 131
 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
 136 @@ -57,7 +57,7 @@
 137  #ifdef WIN32
 138      WSADATA wsadata;
 139
 140 -    WSAStartup(WINSOCK_VERSION, &wsadata);
 141 +    WSAStartup(MAKEWORD(2,0), &wsadata);
 142  #endif
 143
 144      if (argc > 1) {
 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
 148 @@ -57,7 +57,7 @@
 149  #ifdef WIN32
 150      WSADATA wsadata;
 151
 152 -    WSAStartup(WINSOCK_VERSION, &wsadata);
 153 +    WSAStartup(MAKEWORD(2,0), &wsadata);
 154  #endif
 155
 156      if (argc > 1) {
 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
 160 @@ -73,7 +76,7 @@
 161  #ifdef WIN32
 162      WSADATA wsadata;
 163
 164 -    WSAStartup(WINSOCK_VERSION, &wsadata);
 165 +    WSAStartup(MAKEWORD(2,0), &wsadata);
 166  #endif
 167
 168      if (argc > 1) {
 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
 172 @@ -47,12 +47,10 @@
 173  #define strncasecmp _strnicmp
 174  #define strcasecmp _stricmp
 175  #else
 176 -#ifdef __MINGW32__
 177 -#define WINSOCK_VERSION MAKEWORD(2,0)
 178 -#else
 179 +#ifndef __MINGW32__
 180  #define strncasecmp strnicmp
 181  #define strcasecmp stricmp
 182 -#endif /* __MINGW32__ */
 183 +#endif /* !__MINGW32__ */
 184  #endif /* _MSC_VER */
 185
 186  /* Compile in zlib support */