Skip to content

Commit fda2dc5

Browse files
committed
---
yaml --- r: 147390 b: refs/heads/try2 c: dfe58a9 h: refs/heads/master v: v3
1 parent 7c9dfe3 commit fda2dc5

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 20f13b228f5e5cc10e19c045a0dd52ec29b6cc45
8+
refs/heads/try2: dfe58a9851011dd2d54b7db96b4eec3f30a3d250
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustuv/uvll.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,9 @@ extern {
728728
// libuv requires other native libraries on various platforms. These are all
729729
// listed here (for each platform)
730730

731-
#[cfg(not(target_os = "android"))] // apparently pthreads isn't on android?
731+
// libuv doesn't use pthread on windows
732+
// android libc (bionic) provides pthread, so no additional link is required
733+
#[cfg(not(windows), not(target_os = "android"))]
732734
#[link(name = "pthread")]
733735
extern {}
734736

0 commit comments

Comments
 (0)