Use defined(__sun) instead of defined(sun)

[openssl.git] / crypto / thr_id.c

diff --git a/crypto/thr_id.c b/crypto/thr_id.c
index 2be0a546d91a0e0aba4756e564534ee10f4ac19e..51088e4fb5e18e1e43fac29c163dd2f9a41642e7 100644 (file)
--- a/crypto/thr_id.c
+++ b/crypto/thr_id.c
@@ -114,7 +114,7 @@
  * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
  */
 
-#include "cryptlib.h"
+#include "internal/cryptlib.h"
 
 #ifndef OPENSSL_NO_DEPRECATED
 static unsigned long (*id_callback) (void) = 0;
@@ -146,7 +146,7 @@ void CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr)
         /*
          * 'ptr' can be embedded in 'val' without loss of uniqueness
          */
-        id->val = (unsigned long)id->ptr;
+        id->val = (size_t)id->ptr;
         return;
     }
     /*