Skip to content

Commit 35cd73c

Browse files
e5le5l
authored
Fix windows build (#3752)
* Fix curl distribution * Add missing SSE capability for WinHttp
1 parent 4e07170 commit 35cd73c

File tree

24 files changed

+239
-458
lines changed

24 files changed

+239
-458
lines changed

‎ktor-client/ktor-client-curl/desktop/interop/libcurl.def

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,12 @@ libidn2.a \
4242
libpsl.a \
4343
libbrotlidec.a \
4444
libbrotlicommon.a \
45-
libnghttp2.a \
4645
libunistring.a \
4746
libzstd.a \
48-
libssl.a \
49-
libcrypto.a \
5047

5148
libraryPaths = desktop/interop/mingwX64/lib
5249

53-
linkerOpts.mingw_x64 = -Wl,-Bstatic -lstdc++ -static -fstack-protector \
50+
linkerOpts.mingw_x64 = -Wl,-Bstatic -lstdc++ -static \
5451
-lbcrypt \
5552
-lcrypt32 \
5653
-liconv \

‎ktor-client/ktor-client-curl/desktop/interop/mingwX64/include/curl/curl.h

Lines changed: 96 additions & 195 deletions
Large diffs are not rendered by default.

‎ktor-client/ktor-client-curl/desktop/interop/mingwX64/include/curl/curlver.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* | (__| |_| | _ <| |___
88
* \___|\___/|_| \_\_____|
99
*
10-
* Copyright (C) Daniel Stenberg, <[email protected]>, et al.
10+
* Copyright (C) 1998 - 2022, Daniel Stenberg, <[email protected]>, et al.
1111
*
1212
* This software is licensed as described in the file COPYING, which
1313
* you should have received as part of this distribution. The terms
@@ -28,17 +28,17 @@
2828
a script at release-time. This was made its own header file in 7.11.2 */
2929

3030
/* This is the global package copyright */
31-
#define LIBCURL_COPYRIGHT "Daniel Stenberg, <[email protected]>."
31+
#define LIBCURL_COPYRIGHT "1996 - 2022 Daniel Stenberg, <[email protected]>."
3232

3333
/* This is the version number of the libcurl package from which this header
3434
file origins: */
35-
#define LIBCURL_VERSION "8.0.1"
35+
#define LIBCURL_VERSION "7.84.0"
3636

3737
/* The numeric version number is also available "in parts" by using these
3838
defines: */
39-
#define LIBCURL_VERSION_MAJOR 8
40-
#define LIBCURL_VERSION_MINOR 0
41-
#define LIBCURL_VERSION_PATCH 1
39+
#define LIBCURL_VERSION_MAJOR 7
40+
#define LIBCURL_VERSION_MINOR 84
41+
#define LIBCURL_VERSION_PATCH 0
4242

4343
/* This is the numeric version of the libcurl version number, meant for easier
4444
parsing and comparisons by programs. The LIBCURL_VERSION_NUM define will
@@ -59,7 +59,7 @@
5959
CURL_VERSION_BITS() macro since curl's own configure script greps for it
6060
and needs it to contain the full number.
6161
*/
62-
#define LIBCURL_VERSION_NUM 0x080001
62+
#define LIBCURL_VERSION_NUM 0x075400
6363

6464
/*
6565
* This is the date and time when the full source package was created. The
@@ -70,7 +70,7 @@
7070
*
7171
* "2007-11-23"
7272
*/
73-
#define LIBCURL_TIMESTAMP "2023-03-20"
73+
#define LIBCURL_TIMESTAMP "2022-06-27"
7474

7575
#define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|(z))
7676
#define CURL_AT_LEAST_VERSION(x,y,z) \

‎ktor-client/ktor-client-curl/desktop/interop/mingwX64/include/curl/easy.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* | (__| |_| | _ <| |___
88
* \___|\___/|_| \_\_____|
99
*
10-
* Copyright (C) Daniel Stenberg, <[email protected]>, et al.
10+
* Copyright (C) 1998 - 2022, Daniel Stenberg, <[email protected]>, et al.
1111
*
1212
* This software is licensed as described in the file COPYING, which
1313
* you should have received as part of this distribution. The terms
@@ -119,7 +119,7 @@ CURL_EXTERN CURLcode curl_easy_send(CURL *curl, const void *buffer,
119119
CURL_EXTERN CURLcode curl_easy_upkeep(CURL *curl);
120120

121121
#ifdef __cplusplus
122-
} /* end of extern "C" */
122+
}
123123
#endif
124124

125125
#endif

‎ktor-client/ktor-client-curl/desktop/interop/mingwX64/include/curl/header.h

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* | (__| |_| | _ <| |___
88
* \___|\___/|_| \_\_____|
99
*
10-
* Copyright (C) Daniel Stenberg, <[email protected]>, et al.
10+
* Copyright (C) 2018 - 2022, Daniel Stenberg, <[email protected]>, et al.
1111
*
1212
* This software is licensed as described in the file COPYING, which
1313
* you should have received as part of this distribution. The terms
@@ -24,10 +24,6 @@
2424
*
2525
***************************************************************************/
2626

27-
#ifdef __cplusplus
28-
extern "C" {
29-
#endif
30-
3127
struct curl_header {
3228
char *name; /* this might not use the same case */
3329
char *value;
@@ -67,8 +63,4 @@ CURL_EXTERN struct curl_header *curl_easy_nextheader(CURL *easy,
6763
int request,
6864
struct curl_header *prev);
6965

70-
#ifdef __cplusplus
71-
} /* end of extern "C" */
72-
#endif
73-
7466
#endif /* CURLINC_HEADER_H */

‎ktor-client/ktor-client-curl/desktop/interop/mingwX64/include/curl/mprintf.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* | (__| |_| | _ <| |___
88
* \___|\___/|_| \_\_____|
99
*
10-
* Copyright (C) Daniel Stenberg, <[email protected]>, et al.
10+
* Copyright (C) 1998 - 2022, Daniel Stenberg, <[email protected]>, et al.
1111
*
1212
* This software is licensed as described in the file COPYING, which
1313
* you should have received as part of this distribution. The terms
@@ -46,7 +46,7 @@ CURL_EXTERN char *curl_maprintf(const char *format, ...);
4646
CURL_EXTERN char *curl_mvaprintf(const char *format, va_list args);
4747

4848
#ifdef __cplusplus
49-
} /* end of extern "C" */
49+
}
5050
#endif
5151

5252
#endif /* CURLINC_MPRINTF_H */

‎ktor-client/ktor-client-curl/desktop/interop/mingwX64/include/curl/multi.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* | (__| |_| | _ <| |___
88
* \___|\___/|_| \_\_____|
99
*
10-
* Copyright (C) Daniel Stenberg, <[email protected]>, et al.
10+
* Copyright (C) 1998 - 2022, Daniel Stenberg, <[email protected]>, et al.
1111
*
1212
* This software is licensed as described in the file COPYING, which
1313
* you should have received as part of this distribution. The terms
@@ -124,7 +124,7 @@ struct curl_waitfd {
124124
/*
125125
* Name: curl_multi_init()
126126
*
127-
* Desc: initialize multi-style curl usage
127+
* Desc: inititalize multi-style curl usage
128128
*
129129
* Returns: a new CURLM handle to use in all 'curl_multi' functions.
130130
*/
@@ -318,16 +318,16 @@ typedef int (*curl_multi_timer_callback)(CURLM *multi, /* multi handle */
318318
void *userp); /* private callback
319319
pointer */
320320

321-
CURL_EXTERN CURLMcode CURL_DEPRECATED(7.19.5, "Use curl_multi_socket_action()")
322-
curl_multi_socket(CURLM *multi_handle, curl_socket_t s, int *running_handles);
321+
CURL_EXTERN CURLMcode curl_multi_socket(CURLM *multi_handle, curl_socket_t s,
322+
int *running_handles);
323323

324324
CURL_EXTERN CURLMcode curl_multi_socket_action(CURLM *multi_handle,
325325
curl_socket_t s,
326326
int ev_bitmask,
327327
int *running_handles);
328328

329-
CURL_EXTERN CURLMcode CURL_DEPRECATED(7.19.5, "Use curl_multi_socket_action()")
330-
curl_multi_socket_all(CURLM *multi_handle, int *running_handles);
329+
CURL_EXTERN CURLMcode curl_multi_socket_all(CURLM *multi_handle,
330+
int *running_handles);
331331

332332
#ifndef CURL_ALLOW_OLD_MULTI_SOCKET
333333
/* This macro below was added in 7.16.3 to push users who recompile to use

‎ktor-client/ktor-client-curl/desktop/interop/mingwX64/include/curl/options.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* | (__| |_| | _ <| |___
88
* \___|\___/|_| \_\_____|
99
*
10-
* Copyright (C) Daniel Stenberg, <[email protected]>, et al.
10+
* Copyright (C) 2018 - 2022, Daniel Stenberg, <[email protected]>, et al.
1111
*
1212
* This software is licensed as described in the file COPYING, which
1313
* you should have received as part of this distribution. The terms
@@ -33,7 +33,7 @@ typedef enum {
3333
CURLOT_VALUES, /* (a defined set or bitmask) */
3434
CURLOT_OFF_T, /* curl_off_t (a range of values) */
3535
CURLOT_OBJECT, /* pointer (void *) */
36-
CURLOT_STRING, /* (char * to null-terminated buffer) */
36+
CURLOT_STRING, /* (char * to zero terminated buffer) */
3737
CURLOT_SLIST, /* (struct curl_slist *) */
3838
CURLOT_CBPTR, /* (void * passed as-is to a callback) */
3939
CURLOT_BLOB, /* blob (struct curl_blob *) */

‎ktor-client/ktor-client-curl/desktop/interop/mingwX64/include/curl/stdcheaders.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* | (__| |_| | _ <| |___
88
* \___|\___/|_| \_\_____|
99
*
10-
* Copyright (C) Daniel Stenberg, <[email protected]>, et al.
10+
* Copyright (C) 1998 - 2022, Daniel Stenberg, <[email protected]>, et al.
1111
*
1212
* This software is licensed as described in the file COPYING, which
1313
* you should have received as part of this distribution. The terms

‎ktor-client/ktor-client-curl/desktop/interop/mingwX64/include/curl/system.h

Lines changed: 12 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* | (__| |_| | _ <| |___
88
* \___|\___/|_| \_\_____|
99
*
10-
* Copyright (C) Daniel Stenberg, <[email protected]>, et al.
10+
* Copyright (C) 1998 - 2022, Daniel Stenberg, <[email protected]>, et al.
1111
*
1212
* This software is licensed as described in the file COPYING, which
1313
* you should have received as part of this distribution. The terms
@@ -164,33 +164,13 @@
164164
# endif
165165
# define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int
166166

167-
#elif defined(macintosh)
168-
# include <ConditionalMacros.h>
169-
# if TYPE_LONGLONG
170-
# define CURL_TYPEOF_CURL_OFF_T long long
171-
# define CURL_FORMAT_CURL_OFF_T "lld"
172-
# define CURL_FORMAT_CURL_OFF_TU "llu"
173-
# define CURL_SUFFIX_CURL_OFF_T LL
174-
# define CURL_SUFFIX_CURL_OFF_TU ULL
175-
# else
176-
# define CURL_TYPEOF_CURL_OFF_T long
177-
# define CURL_FORMAT_CURL_OFF_T "ld"
178-
# define CURL_FORMAT_CURL_OFF_TU "lu"
179-
# define CURL_SUFFIX_CURL_OFF_T L
180-
# define CURL_SUFFIX_CURL_OFF_TU UL
181-
# endif
182-
# define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int
183-
184-
#elif defined(__TANDEM)
185-
# if ! defined(__LP64)
186-
/* Required for 32-bit NonStop builds only. */
167+
#elif defined(__MWERKS__)
187168
# define CURL_TYPEOF_CURL_OFF_T long long
188169
# define CURL_FORMAT_CURL_OFF_T "lld"
189170
# define CURL_FORMAT_CURL_OFF_TU "llu"
190171
# define CURL_SUFFIX_CURL_OFF_T LL
191172
# define CURL_SUFFIX_CURL_OFF_TU ULL
192173
# define CURL_TYPEOF_CURL_SOCKLEN_T int
193-
# endif
194174

195175
#elif defined(_WIN32_WCE)
196176
# define CURL_TYPEOF_CURL_OFF_T __int64
@@ -227,14 +207,16 @@
227207
# define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int
228208

229209
#elif defined(__OS400__)
230-
# define CURL_TYPEOF_CURL_OFF_T long long
231-
# define CURL_FORMAT_CURL_OFF_T "lld"
232-
# define CURL_FORMAT_CURL_OFF_TU "llu"
233-
# define CURL_SUFFIX_CURL_OFF_T LL
234-
# define CURL_SUFFIX_CURL_OFF_TU ULL
235-
# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
236-
# define CURL_PULL_SYS_TYPES_H 1
237-
# define CURL_PULL_SYS_SOCKET_H 1
210+
# if defined(__ILEC400__)
211+
# define CURL_TYPEOF_CURL_OFF_T long long
212+
# define CURL_FORMAT_CURL_OFF_T "lld"
213+
# define CURL_FORMAT_CURL_OFF_TU "llu"
214+
# define CURL_SUFFIX_CURL_OFF_T LL
215+
# define CURL_SUFFIX_CURL_OFF_TU ULL
216+
# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
217+
# define CURL_PULL_SYS_TYPES_H 1
218+
# define CURL_PULL_SYS_SOCKET_H 1
219+
# endif
238220

239221
#elif defined(__MVS__)
240222
# if defined(__IBMC__) || defined(__IBMCPP__)

0 commit comments

Comments
 (0)