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 cn...@apache.org on 2016/03/19 00:43:56 UTC
[1/2] hadoop git commit: HADOOP-12926. lz4.c does not detect 64-bit
mode properly. Contributed by Alan Burlison.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 dd1e4107e -> 283e44f97
refs/heads/trunk fbe3e8697 -> 33239c992
HADOOP-12926. lz4.c does not detect 64-bit mode properly. Contributed by Alan Burlison.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/33239c99
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/33239c99
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/33239c99
Branch: refs/heads/trunk
Commit: 33239c99257dac08f7644be3701770daa75044cd
Parents: fbe3e86
Author: Chris Nauroth <cn...@apache.org>
Authored: Fri Mar 18 16:33:01 2016 -0700
Committer: Chris Nauroth <cn...@apache.org>
Committed: Fri Mar 18 16:33:01 2016 -0700
----------------------------------------------------------------------
.../src/main/native/src/org/apache/hadoop/io/compress/lz4/lz4.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/33239c99/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/lz4/lz4.c
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/lz4/lz4.c b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/lz4/lz4.c
index 39f176f..5c51afe 100644
--- a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/lz4/lz4.c
+++ b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/lz4/lz4.c
@@ -52,7 +52,7 @@
|| defined(__ppc64__) || defined(__ppc64le__) \
|| defined(__PPC64__) || defined(__PPC64LE__) \
|| defined(__ia64) || defined(__itanium__) || defined(_M_IA64) \
- || defined(__s390x__) ) /* Detects 64 bits mode */
+ || defined(__s390x__) || defined(_LP64)) /* Detects 64 bits mode */
# define LZ4_ARCH64 1
#else
# define LZ4_ARCH64 0
[2/2] hadoop git commit: HADOOP-12926. lz4.c does not detect 64-bit
mode properly. Contributed by Alan Burlison.
Posted by cn...@apache.org.
HADOOP-12926. lz4.c does not detect 64-bit mode properly. Contributed by Alan Burlison.
(cherry picked from commit 33239c99257dac08f7644be3701770daa75044cd)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/283e44f9
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/283e44f9
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/283e44f9
Branch: refs/heads/branch-2
Commit: 283e44f9780e38403fd999549700dd58174cb811
Parents: dd1e410
Author: Chris Nauroth <cn...@apache.org>
Authored: Fri Mar 18 16:33:01 2016 -0700
Committer: Chris Nauroth <cn...@apache.org>
Committed: Fri Mar 18 16:33:28 2016 -0700
----------------------------------------------------------------------
.../src/main/native/src/org/apache/hadoop/io/compress/lz4/lz4.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/283e44f9/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/lz4/lz4.c
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/lz4/lz4.c b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/lz4/lz4.c
index 39f176f..5c51afe 100644
--- a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/lz4/lz4.c
+++ b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/lz4/lz4.c
@@ -52,7 +52,7 @@
|| defined(__ppc64__) || defined(__ppc64le__) \
|| defined(__PPC64__) || defined(__PPC64LE__) \
|| defined(__ia64) || defined(__itanium__) || defined(_M_IA64) \
- || defined(__s390x__) ) /* Detects 64 bits mode */
+ || defined(__s390x__) || defined(_LP64)) /* Detects 64 bits mode */
# define LZ4_ARCH64 1
#else
# define LZ4_ARCH64 0