From ff6887b83cbba47a70f45b156693bbfafc62c4f0 Mon Sep 17 00:00:00 2001 From: Jered Floyd Date: Thu, 11 Aug 2022 16:24:43 +0000 Subject: [PATCH] Change linux/fs include to build with glibc 2.36 --- configure.ac | 4 ++-- src/tscore/ink_file.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 3e9b7871bc2..df4623d316b 100644 --- a/configure.ac +++ b/configure.ac @@ -1902,8 +1902,8 @@ AC_CHECK_HEADERS([sys/types.h \ # On OpenBSD, pthread.h must be included before pthread_np.h AC_CHECK_HEADERS([pthread_np.h], [], [], [#include ]) -AC_CHECK_HEADERS([sys/statfs.h sys/statvfs.h sys/disk.h sys/disklabel.h]) -AC_CHECK_HEADERS([linux/hdreg.h linux/fs.h linux/major.h]) +AC_CHECK_HEADERS([sys/statfs.h sys/statvfs.h sys/disk.h sys/disklabel.h sys/mount.h]) +AC_CHECK_HEADERS([linux/hdreg.h linux/major.h]) AC_CHECK_HEADERS([sys/sysctl.h], [], [], [[#ifdef HAVE_SYS_PARAM_H diff --git a/src/tscore/ink_file.cc b/src/tscore/ink_file.cc index 37995b0be11..6e960aaa726 100644 --- a/src/tscore/ink_file.cc +++ b/src/tscore/ink_file.cc @@ -52,8 +52,8 @@ #include /* for struct hd_geometry */ #endif -#if HAVE_LINUX_FS_H -#include /* for BLKGETSIZE. sys/mount.h is another candidate */ +#if HAVE_SYS_MOUNT_H +#include /* for BLKGETSIZE */ #endif using ioctl_arg_t = union {