Use AC_HEADER_MAJOR to detect major()/minor()/makedev()

Before the change build failed on Gentoo as: bdev/lxclvm.c: In function 'lvm_detect': bdev/lxclvm.c:140:4: error: implicit declaration of function 'major' [-Werror=implicit-function-declaration] major(statbuf.st_rdev), minor(statbuf.st_rdev)); ^~~~~ bdev/lxclvm.c:140:28: error: implicit declaration of function 'minor' [-Werror=implicit-function-declaration] major(statbuf.st_rdev), minor(statbuf.st_rdev)); ^~~~~ glibc plans to remove <sys/sysmacros.h> from glibc's <sys/types.h>: https://sourceware.org/ml/libc-alpha/2015-11/msg00253.html Gentoo already applied glibc patch to experimental glibc-2.24 to start preparingfor the change. Autoconf has AC_HEADER_MAJOR to find out which header defines reqiured macros: https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Particular-Headers.html This change should also increase portability across other libcs. Bug: https://bugs.gentoo.org/604360Signed-off-by: Sergei Trofimovich <siarheit@google.com>

Use AC_HEADER_MAJOR to detect major()/minor()/makedev()
e44a5652 · Sergei Trofimovich · Stéphane Graber · e8a89cf3 · e44a5652 · e44a5652
Commit e44a5652 authored Jan 21, 2017 by Sergei Trofimovich Committed by Stéphane Graber Jan 22, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 28 additions and 0 deletions

configure.ac configure.ac +3 -0

bdev.c src/lxc/bdev.c +8 -0

conf.c src/lxc/conf.c +9 -0

lxccontainer.c src/lxc/lxccontainer.c +8 -0

No files found.
--- a/configure.ac
+++ b/configure.ac
@@ -565,6 +565,9 @@ AC_CHECK_DECLS([PR_CAPBSET_DROP], [], [], [#include <sys/prctl.h>])
 # Check for some headers
 AC_CHECK_HEADERS([sys/signalfd.h pty.h ifaddrs.h sys/capability.h sys/personality.h utmpx.h sys/timerfd.h])

+# lookup major()/minor()/makedev()
+AC_HEADER_MAJOR
+
 # Check for some syscalls functions
 AC_CHECK_FUNCS([setns pivot_root sethostname unshare rand_r confstr faccessat])


--- a/src/lxc/bdev.c
+++ b/src/lxc/bdev.c
@@ -54,6 +54,14 @@
 #include "lxclock.h"
 #include "lxc-btrfs.h"

+/* makedev() */
+#ifdef MAJOR_IN_MKDEV
+#    include <sys/mkdev.h>
+#endif
+#ifdef MAJOR_IN_SYSMACROS
+#    include <sys/sysmacros.h>
+#endif
+
 #ifndef BLKGETSIZE64
 #define BLKGETSIZE64 _IOR(0x12,114,size_t)
 #endif

--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -36,6 +36,15 @@
 #include <pwd.h>
 #include <grp.h>
 #include <time.h>
+
+/* makedev() */
+#ifdef MAJOR_IN_MKDEV
+#    include <sys/mkdev.h>
+#endif
+#ifdef MAJOR_IN_SYSMACROS
+#    include <sys/sysmacros.h>
+#endif
+
 #ifdef HAVE_STATVFS
 #include <sys/statvfs.h>
 #endif

--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -56,6 +56,14 @@
 #include "namespace.h"
 #include "lxclock.h"

+/* major()/minor() */
+#ifdef MAJOR_IN_MKDEV
+#    include <sys/mkdev.h>
+#endif
+#ifdef MAJOR_IN_SYSMACROS
+#    include <sys/sysmacros.h>
+#endif
+
 #if HAVE_IFADDRS_H
 #include <ifaddrs.h>
 #else