Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 63FA318B58 for ; Tue, 7 Jul 2015 19:08:25 +0000 (UTC) Received: (qmail 21221 invoked by uid 500); 7 Jul 2015 19:08:23 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 21078 invoked by uid 500); 7 Jul 2015 19:08:23 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 20939 invoked by uid 99); 7 Jul 2015 19:08:23 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Jul 2015 19:08:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 538DFE3A9D; Tue, 7 Jul 2015 19:08:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aw@apache.org To: common-commits@hadoop.apache.org Date: Tue, 07 Jul 2015 19:08:25 -0000 Message-Id: In-Reply-To: <3af969caff224cff921bee732178da5c@git.apache.org> References: <3af969caff224cff921bee732178da5c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/9] hadoop git commit: HADOOP-11974. Fix FIONREAD #include on Solaris (Alan Burlison via Colin P. McCabe) HADOOP-11974. Fix FIONREAD #include on Solaris (Alan Burlison 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/81f36443 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/81f36443 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/81f36443 Branch: refs/heads/HADOOP-12111 Commit: 81f364437608b21e85fc393f63546bf8b425ac71 Parents: bf89ddb Author: Colin Patrick Mccabe Authored: Mon Jul 6 12:56:34 2015 -0700 Committer: Colin Patrick Mccabe Committed: Mon Jul 6 17:17:59 2015 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../native/src/org/apache/hadoop/net/unix/DomainSocket.c | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/81f36443/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 fab78d4..faf5a5c 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -678,6 +678,9 @@ Release 2.8.0 - UNRELEASED HADOOP-12045. Enable LocalFileSystem#setTimes to change atime. (Kazuho Fujii via cnauroth) + HADOOP-11974. Fix FIONREAD #include on Solaris (Alan Burlison via Colin P. + McCabe) + OPTIMIZATIONS HADOOP-11785. Reduce the number of listStatus operation in distcp http://git-wip-us.apache.org/repos/asf/hadoop/blob/81f36443/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/net/unix/DomainSocket.c ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/net/unix/DomainSocket.c b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/net/unix/DomainSocket.c index a3f27ee..e658d8f 100644 --- a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/net/unix/DomainSocket.c +++ b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/net/unix/DomainSocket.c @@ -31,7 +31,14 @@ #include #include #include -#include /* for FIONREAD */ + +/* For FIONREAD */ +#if defined(__sun) +#include +#else +#include +#endif + #include #include #include