File tree Expand file tree Collapse file tree 2 files changed +4
-6
lines changed
branches/try/src/librustuv Expand file tree Collapse file tree 2 files changed +4
-6
lines changed Original file line number Diff line number Diff line change 2
2
refs/heads/master: 8794107f74682607f368776cc8b78820629778e6
3
3
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4
4
refs/heads/snap-stage3: ae81c89f34f1ac2cdb596cf216612e94822a8466
5
- refs/heads/try: d3444779e6776025ee19202c5e69964abde90374
5
+ refs/heads/try: d9eac5d99c105d45d9c503abad9020bb3d8e0bad
6
6
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
7
7
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8
8
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
Original file line number Diff line number Diff line change @@ -723,12 +723,11 @@ extern {
723
723
724
724
// libuv doesn't use pthread on windows
725
725
// android libc (bionic) provides pthread, so no additional link is required
726
- #[ cfg( not( windows) , not ( target_os = "android" ) ) ]
726
+ #[ cfg( not( any ( windows, target_os = "android" ) ) ) ]
727
727
#[ link( name = "pthread" ) ]
728
728
extern { }
729
729
730
- #[ cfg( target_os = "linux" ) ]
731
- #[ cfg( target_os = "dragonfly" ) ]
730
+ #[ cfg( any( target_os = "linux" , target_os = "dragonfly" ) ) ]
732
731
#[ link( name = "rt" ) ]
733
732
extern { }
734
733
@@ -738,7 +737,6 @@ extern {}
738
737
#[ link( name = "iphlpapi" ) ]
739
738
extern { }
740
739
741
- #[ cfg( target_os = "freebsd" ) ]
742
- #[ cfg( target_os = "dragonfly" ) ]
740
+ #[ cfg( any( target_os = "freebsd" , target_os = "dragonfly" ) ) ]
743
741
#[ link( name = "kvm" ) ]
744
742
extern { }
You can’t perform that action at this time.
0 commit comments