kudu-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ale...@apache.org
Subject kudu git commit: [util] fix compilation breakage
Date Thu, 14 Sep 2017 05:32:06 GMT
Repository: kudu
Updated Branches:
  refs/heads/master d45eb2700 -> 0ed75067c

[util] fix compilation breakage

On some Linux systems (old ones), there isn't linux/sysinfo.h
header file.  IWYU might suggest to include linux/sysinfo.h
instead of linux/kernel.h if compiling on a new system, so I added
corresponding IWYU pragmas.

I'll address the IWYU issue in a generic way in a separate change
list (so no pragmas would be necessary).  This patch is a quick
fix for the compilation breakage.

Change-Id: Ie9d13815052d8e4c1360db3f94e15ffd77768af5
Reviewed-on: http://gerrit.cloudera.org:8080/8065
Reviewed-by: Adar Dembo <adar@cloudera.com>
Reviewed-by: Andrew Wong <awong@cloudera.com>
Tested-by: Kudu Jenkins

Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/0ed75067
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/0ed75067
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/0ed75067

Branch: refs/heads/master
Commit: 0ed75067cf805dda8784cca5ea7a3e7a43616ac6
Parents: d45eb27
Author: Alexey Serbin <aserbin@cloudera.com>
Authored: Wed Sep 13 21:50:18 2017 -0700
Committer: Alexey Serbin <aserbin@cloudera.com>
Committed: Thu Sep 14 05:25:46 2017 +0000

 src/kudu/util/env_posix.cc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/kudu/util/env_posix.cc b/src/kudu/util/env_posix.cc
index 9dd5e2b..3352853 100644
--- a/src/kudu/util/env_posix.cc
+++ b/src/kudu/util/env_posix.cc
@@ -15,9 +15,6 @@
 #include <sys/uio.h>
 #include <sys/utsname.h>
 #include <unistd.h>
-// IWYU pragma: no_include <asm/int-ll64.h>
-// IWYU pragma: no_include <asm/ioctl.h>
-// IWYU pragma: no_include <sys/statfs.h>
 #include <algorithm>
 #include <cstdint>
@@ -73,12 +70,16 @@
 #include <linux/falloc.h>
 #include <linux/fiemap.h>
 #include <linux/fs.h>
+#include <linux/kernel.h> // IWYU pragma: keep
 #include <linux/magic.h>
-#include <linux/sysinfo.h>
 #include <sys/ioctl.h>
 #include <sys/sysinfo.h>
 #include <sys/vfs.h>  // IWYU pragma: keep
 #endif  // defined(__APPLE__)
+// IWYU pragma: no_include <asm/int-ll64.h>
+// IWYU pragma: no_include <asm/ioctl.h>
+// IWYU pragma: no_include <linux/sysinfo.h>
+// IWYU pragma: no_include <sys/statfs.h>
 using base::subtle::Atomic64;
 using base::subtle::Barrier_AtomicIncrement;

View raw message