Skip to content

Build: remove configure check for sys/mount.h, use C++17 builtin. #9463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SolidWallOfCode merged 1 commit into from
Feb 27, 2023
Merged

Build: remove configure check for sys/mount.h, use C++17 builtin. #9463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1962,7 +1962,7 @@ AC_CHECK_HEADERS([sys/types.h \

# On OpenBSD, pthread.h must be included before pthread_np.h
AC_CHECK_HEADERS([pthread_np.h], [], [], [#include <pthread.h>])
AC_CHECK_HEADERS([sys/statfs.h sys/statvfs.h sys/disk.h sys/disklabel.h sys/mount.h])
AC_CHECK_HEADERS([sys/statfs.h sys/statvfs.h sys/disk.h sys/disklabel.h])
AC_CHECK_HEADERS([linux/hdreg.h linux/major.h])

AC_CHECK_HEADERS([sys/sysctl.h], [], [],
Expand Down
2 changes: 1 addition & 1 deletion include/tscore/ink_file.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

// Darwin keeps statfs(2) in <sys/mount.h> ...
// Its problematic if linux/mount.h is already included so check for that
#if HAVE_SYS_MOUNT_H && !defined(_LINUX_MOUNT_H)
#if __has_include(<sys/mount.h>) && ! defined(_LINUX_MOUNT_H)
#include <sys/mount.h>
#endif

Expand Down
2 changes: 1 addition & 1 deletion src/tscore/ink_file.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
#include <linux/hdreg.h> /* for struct hd_geometry */
#endif

#if HAVE_SYS_MOUNT_H
#if __has_include(<sys/mount.h>)
#include <sys/mount.h> /* for BLKGETSIZE */
#endif

Expand Down