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/6814e83b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6814e83b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6814e83b Branch: refs/heads/YARN-2928 Commit: 6814e83b0522fc34cd3daf5c21b52855fd1a1e70 Parents: fa7dbe2 Author: Colin Patrick Mccabe <[email protected]> Authored: Mon Jul 6 12:56:34 2015 -0700 Committer: Zhijie Shen <[email protected]> Committed: Mon Jul 13 11:43:25 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/6814e83b/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/6814e83b/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 <stdio.h> #include <stdlib.h> #include <string.h> -#include <sys/ioctl.h> /* for FIONREAD */ + +/* For FIONREAD */ +#if defined(__sun) +#include <sys/filio.h> +#else +#include <sys/ioctl.h> +#endif + #include <sys/socket.h> #include <sys/stat.h> #include <sys/types.h>
