You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by zj...@apache.org on 2015/04/06 21:22:44 UTC
[14/50] [abbrv] hadoop git commit: HADOOP-11787.
OpensslSecureRandom.c pthread_threadid_np usage signature is wrong on 32-bit
Mac. Contributed by Kiran Kumar M R.
HADOOP-11787. OpensslSecureRandom.c pthread_threadid_np usage signature is wrong on 32-bit Mac. Contributed by Kiran Kumar M R.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/188b7d0a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/188b7d0a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/188b7d0a
Branch: refs/heads/YARN-2928
Commit: 188b7d0a3cadf3d776f65481c226095a7f4ca611
Parents: 777f01b
Author: cnauroth <cn...@apache.org>
Authored: Wed Apr 1 11:40:09 2015 -0700
Committer: Zhijie Shen <zj...@apache.org>
Committed: Mon Apr 6 12:08:11 2015 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../src/org/apache/hadoop/crypto/random/OpensslSecureRandom.c | 4 +++-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/188b7d0a/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 13d74fd..111fb5e 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1184,6 +1184,9 @@ Release 2.7.0 - UNRELEASED
HADOOP-11754. RM fails to start in non-secure mode due to authentication
filter failure. (wheat9)
+ HADOOP-11787. OpensslSecureRandom.c pthread_threadid_np usage signature is
+ wrong on 32-bit Mac. (Kiran Kumar M R via cnauroth)
+
Release 2.6.1 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/188b7d0a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/random/OpensslSecureRandom.c
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/random/OpensslSecureRandom.c b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/random/OpensslSecureRandom.c
index 8f0c06d..26e1fa6 100644
--- a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/random/OpensslSecureRandom.c
+++ b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/random/OpensslSecureRandom.c
@@ -286,7 +286,9 @@ static unsigned long pthreads_thread_id(void)
#elif defined(__sun)
thread_id = (unsigned long)pthread_self();
#elif defined(__APPLE__)
- (void)pthread_threadid_np(pthread_self(), &thread_id);
+ __uint64_t tmp_thread_id;
+ (void)pthread_threadid_np(pthread_self(), &tmp_thread_id);
+ thread_id = (unsigned long)tmp_thread_id;
#else
#error "Platform not supported"
#endif