Repository: hadoop Updated Branches: refs/heads/branch-2 e92107b18 -> e2d46ac5a
HADOOP-12302. Fix native compilation on Windows after HADOOP-7824 (Vinayakumar B via Colin P. McCabe) (cherry picked from commit 4ab49a436522f87cd462a9eae20fe10fe5c28fb2) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e2d46ac5 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e2d46ac5 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e2d46ac5 Branch: refs/heads/branch-2 Commit: e2d46ac5a4b50a19ba1075c6b32147e81088d6ec Parents: e92107b Author: Colin Patrick Mccabe <[email protected]> Authored: Wed Aug 5 09:46:51 2015 -0700 Committer: Colin Patrick Mccabe <[email protected]> Committed: Wed Aug 5 10:01:32 2015 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c | 2 ++ 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e2d46ac5/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 66655d5..160a4f0 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -552,6 +552,9 @@ Release 2.8.0 - UNRELEASED HADOOP-12274. Remove direct download link from BULIDING.txt. (Caleb Severn via aajisaka) + HADOOP-12302. Fix native compilation on Windows after HADOOP-7824 + (Vinayakumar B via Colin P. McCabe) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/e2d46ac5/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c index a716a02..bd7784e 100644 --- a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c +++ b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c @@ -132,6 +132,7 @@ static void setStaticInt(JNIEnv *env, jclass clazz, char *field, } } +#ifdef UNIX /** * Initialises a list of java constants that are platform specific. * These are only initialized in UNIX. @@ -187,6 +188,7 @@ static void consts_init(JNIEnv *env) { SET_INT_OR_RETURN(env, clazz, S_IWUSR); SET_INT_OR_RETURN(env, clazz, S_IXUSR); } +#endif static void stat_init(JNIEnv *env, jclass nativeio_class) { jclass clazz = NULL;
