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 aw...@apache.org on 2015/08/06 00:40:46 UTC
[08/13] hadoop git commit: HADOOP-12302. Fix native compilation on
Windows after HADOOP-7824 (Vinayakumar B via Colin P. McCabe)
HADOOP-12302. Fix native compilation on Windows after HADOOP-7824 (Vinayakumar B via Colin P. McCabe)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4ab49a43
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4ab49a43
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4ab49a43
Branch: refs/heads/HADOOP-12111
Commit: 4ab49a436522f87cd462a9eae20fe10fe5c28fb2
Parents: 6f83274
Author: Colin Patrick Mccabe <cm...@cloudera.com>
Authored: Wed Aug 5 09:46:51 2015 -0700
Committer: Colin Patrick Mccabe <cm...@cloudera.com>
Committed: Wed Aug 5 09:46:51 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/4ab49a43/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 36d7321..3951a99 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1050,6 +1050,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/4ab49a43/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;