From 5845a6bcd5b36168bdddeb85da8d8d9d36de7642 Mon Sep 17 00:00:00 2001
From: Trevor Norris <trev.norris@gmail.com>
Date: Fri, 7 Nov 2014 13:44:09 -0800
Subject: uv: revert change causing build failures

Revert uv_thread_self() to return unsigned long instead of uv_thread_t.
This was causing a build failure on Windows and is only a temporary fix
until the proper patch lands upstream.

Reverts: https://github.com/joyent/libuv/commit/59658a8
Fixes: ce112c2 "deps: update uv to v1.0.0-rc2"
---
 deps/uv/src/unix/thread.c | 5 -----
 deps/uv/src/uv-common.c   | 6 +++---
 deps/uv/src/win/thread.c  | 5 -----
 3 files changed, 3 insertions(+), 13 deletions(-)

(limited to 'deps/uv/src')

diff --git a/deps/uv/src/unix/thread.c b/deps/uv/src/unix/thread.c
index 00579cb8f0..522426f634 100644
--- a/deps/uv/src/unix/thread.c
+++ b/deps/uv/src/unix/thread.c
@@ -36,11 +36,6 @@ int uv_thread_join(uv_thread_t *tid) {
 }
 
 
-int uv_thread_equal(const uv_thread_t* t1, const uv_thread_t* t2) {
-  return pthread_equal(*t1, *t2);
-}
-
-
 int uv_mutex_init(uv_mutex_t* mutex) {
 #if defined(NDEBUG) || !defined(PTHREAD_MUTEX_ERRORCHECK)
   return -pthread_mutex_init(mutex, NULL);
diff --git a/deps/uv/src/uv-common.c b/deps/uv/src/uv-common.c
index 69fc53ae2c..97727baa54 100644
--- a/deps/uv/src/uv-common.c
+++ b/deps/uv/src/uv-common.c
@@ -306,11 +306,11 @@ int uv_thread_create(uv_thread_t *tid, void (*entry)(void *arg), void *arg) {
 }
 
 
-uv_thread_t uv_thread_self(void) {
+unsigned long uv_thread_self(void) {
 #ifdef _WIN32
-  return GetCurrentThreadId();
+  return (unsigned long) GetCurrentThreadId();
 #else
-  return pthread_self();
+  return (unsigned long) pthread_self();
 #endif
 }
 
diff --git a/deps/uv/src/win/thread.c b/deps/uv/src/win/thread.c
index 5d8d568c01..ccc5579fa7 100644
--- a/deps/uv/src/win/thread.c
+++ b/deps/uv/src/win/thread.c
@@ -129,11 +129,6 @@ int uv_thread_join(uv_thread_t *tid) {
 }
 
 
-int uv_thread_equal(const uv_thread_t* t1, const uv_thread_t* t2) {
-  return *t1 == *t2;
-}
-
-
 int uv_mutex_init(uv_mutex_t* mutex) {
   InitializeCriticalSection(mutex);
   return 0;
-- 
cgit v1.2.3