This is an automated email from the ASF dual-hosted git repository.
dragon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new da4293ce2a Remove HAVE_LINUX_MAJOR_H header (#10820)
da4293ce2a is described below
commit da4293ce2ad85db020319524bd7c2ba5788ece05
Author: Phong Nguyen <[email protected]>
AuthorDate: Tue Nov 28 09:13:48 2023 -0800
Remove HAVE_LINUX_MAJOR_H header (#10820)
---
CMakeLists.txt | 1 -
include/tscore/ink_config.h.cmake.in | 1 -
src/iocore/cache/Store.cc | 2 +-
3 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8d8d352cf..8329c412cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -214,7 +214,6 @@ include(CheckStructHasMember)
check_include_file(ifaddrs.h HAVE_IFADDRS_H)
check_include_file(string.h HAVE_STRING_H)
-check_include_file(linux/major.h HAVE_LINUX_MAJOR_H)
check_include_file(malloc.h HAVE_MALLOC_H)
check_include_file(mcheck.h HAVE_MCHECK_H)
check_include_file(machine/endian.h HAVE_MACHINE_ENDIAN_H)
diff --git a/include/tscore/ink_config.h.cmake.in
b/include/tscore/ink_config.h.cmake.in
index d8ebb14e75..18a9498649 100644
--- a/include/tscore/ink_config.h.cmake.in
+++ b/include/tscore/ink_config.h.cmake.in
@@ -42,7 +42,6 @@
#cmakedefine HAVE_LZMA_H 1
#cmakedefine HAVE_IFADDRS_H 1
#cmakedefine HAVE_LINUX_HDREG_H 1
-#cmakedefine HAVE_LINUX_MAJOR_H 1
#cmakedefine HAVE_MALLOC_H 1
#cmakedefine HAVE_MCHECK_H 1
#cmakedefine HAVE_MACHINE_ENDIAN_H 1
diff --git a/src/iocore/cache/Store.cc b/src/iocore/cache/Store.cc
index e5ff2d2af8..988243ec92 100644
--- a/src/iocore/cache/Store.cc
+++ b/src/iocore/cache/Store.cc
@@ -30,7 +30,7 @@
#include "tscore/SimpleTokenizer.h"
#include "tscore/runroot.h"
-#if HAVE_LINUX_MAJOR_H
+#if __has_include(<linux/major.h>)
#include <linux/major.h>
#endif
