From c614ceed84e6d942137ddca76654b77f7df368c9 Mon Sep 17 00:00:00 2001 From: Chris Nauroth Date: Sat, 2 Aug 2014 15:02:23 +0000 Subject: [PATCH] HADOOP-10925. Compilation fails in native link0 function on Windows. Contributed by Chris Nauroth. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615320 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 0dbfc6e1348..7e3bee29110 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -413,6 +413,9 @@ Trunk (Unreleased) HADOOP-10920. site plugin couldn't parse hadoop-kms index.apt.vm. (Akira Ajisaka via wang) + HADOOP-10925. Compilation fails in native link0 function on Windows. + (cnauroth) + OPTIMIZATIONS HADOOP-7761. Improve the performance of raw comparisons. (todd) 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 f3885d7499a..23513bfd667 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 @@ -1081,7 +1081,7 @@ done: if (!src) goto done; // exception was thrown dst = (LPCTSTR) (*env)->GetStringChars(env, jdst, NULL); if (!dst) goto done; // exception was thrown - if (!CreateHardLink(dst, src)) { + if (!CreateHardLink(dst, src, NULL)) { throw_ioe(env, GetLastError()); }