Skip to content

Commit ffb8022

Browse files
committed
---
yaml --- r: 135934 b: refs/heads/try c: d9eac5d h: refs/heads/master v: v3
1 parent 3a676ac commit ffb8022

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 8794107f74682607f368776cc8b78820629778e6
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: ae81c89f34f1ac2cdb596cf216612e94822a8466
5-
refs/heads/try: d3444779e6776025ee19202c5e69964abde90374
5+
refs/heads/try: d9eac5d99c105d45d9c503abad9020bb3d8e0bad
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustuv/uvll.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -723,12 +723,11 @@ extern {
723723

724724
// libuv doesn't use pthread on windows
725725
// 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")))]
727727
#[link(name = "pthread")]
728728
extern {}
729729

730-
#[cfg(target_os = "linux")]
731-
#[cfg(target_os = "dragonfly")]
730+
#[cfg(any(target_os = "linux", target_os = "dragonfly"))]
732731
#[link(name = "rt")]
733732
extern {}
734733

@@ -738,7 +737,6 @@ extern {}
738737
#[link(name = "iphlpapi")]
739738
extern {}
740739

741-
#[cfg(target_os = "freebsd")]
742-
#[cfg(target_os = "dragonfly")]
740+
#[cfg(any(target_os = "freebsd", target_os = "dragonfly"))]
743741
#[link(name = "kvm")]
744742
extern {}

0 commit comments

Comments
 (0)