File tree Expand file tree Collapse file tree 4 files changed +16
-3
lines changed Expand file tree Collapse file tree 4 files changed +16
-3
lines changed Original file line number Diff line number Diff line change 1
1
name : CI
2
- on : [push, pull_request]
2
+ on :
3
+ push :
4
+ branches : [master]
5
+ pull_request :
6
+ branches : [master]
3
7
4
8
jobs :
5
9
test :
Original file line number Diff line number Diff line change @@ -171,6 +171,7 @@ fn main() {
171
171
. file ( "curl/lib/share.c" )
172
172
. file ( "curl/lib/slist.c" )
173
173
. file ( "curl/lib/socks.c" )
174
+ . file ( "curl/lib/socketpair.c" )
174
175
. file ( "curl/lib/speedcheck.c" )
175
176
. file ( "curl/lib/splay.c" )
176
177
. file ( "curl/lib/strcase.c" )
@@ -292,6 +293,7 @@ fn main() {
292
293
. define ( "HAVE_SEND" , None )
293
294
. define ( "HAVE_SOCKET" , None )
294
295
. define ( "HAVE_STERRROR_R" , None )
296
+ . define ( "HAVE_SOCKETPAIR" , None )
295
297
. define ( "HAVE_STRUCT_TIMEVAL" , None )
296
298
. define ( "USE_THREADS_POSIX" , None )
297
299
. define ( "RECV_TYPE_ARG2" , "void*" )
Original file line number Diff line number Diff line change @@ -21,6 +21,7 @@ fn main() {
21
21
. next ( )
22
22
. and_then ( |s| s. parse :: < u32 > ( ) . ok ( ) )
23
23
. unwrap_or ( 10000 ) ;
24
+ println ! ( "got version: {}" , version) ;
24
25
25
26
if env:: var ( "TARGET" ) . unwrap ( ) . contains ( "msvc" ) {
26
27
cfg. flag ( "/wd4574" ) ; // did you mean to use '#if INCL_WINSOCK_API_TYPEDEFS'
@@ -60,6 +61,12 @@ fn main() {
60
61
} ) ;
61
62
62
63
cfg. skip_const ( move |s| {
64
+ if version < 65 {
65
+ match s {
66
+ "CURLVERSION_SIXTH" | "CURLVERSION_NOW" => return true ,
67
+ _ => { }
68
+ }
69
+ }
63
70
if version < 64 {
64
71
match s {
65
72
"CURLE_HTTP2" => return true ,
@@ -81,7 +88,7 @@ fn main() {
81
88
}
82
89
if version < 60 {
83
90
match s {
84
- "CURLVERSION_FIFTH" | "CURLVERSION_SIXTH" | "CURLVERSION_NOW" => return true ,
91
+ "CURLVERSION_FIFTH" => return true ,
85
92
_ => { }
86
93
}
87
94
}
You can’t perform that action at this time.
0 commit comments