From 0b2d10a603710d816b3b86aedea326f7c8fe26d3 Mon Sep 17 00:00:00 2001
From: Charles Phillips <charles@doublerebel.com>
Date: Mon, 25 Jan 2016 22:54:58 -0800
Subject: [PATCH] fix,solaris: invalid conversion from 'unsigned int' to
 'void*' ptr

---
 lib/Rest/InitializeRest.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/Rest/InitializeRest.cpp b/lib/Rest/InitializeRest.cpp
index 235189fd7d..3a6ece84fb 100644
--- a/lib/Rest/InitializeRest.cpp
+++ b/lib/Rest/InitializeRest.cpp
@@ -58,10 +58,17 @@ unsigned long opensslThreadId() { return (unsigned long)TRI_CurrentThreadId(); }
 // The compiler chooses the right one from the following two,
 // according to the type of the return value of pthread_self():
 
+#ifndef __sun
 template <typename T>
 void setter(CRYPTO_THREADID* id, T p) {
   CRYPTO_THREADID_set_pointer(id, p);
 }
+#else
+template <typename T>
+void setter(CRYPTO_THREADID* id, T p) {
+  CRYPTO_THREADID_set_pointer(id, (void *) (intptr_t) p);
+}
+#endif
 
 #ifndef __APPLE__
 template <>