From 9dbaeb0adbeed892fa1bf8f91cd7df07d94e0367 Mon Sep 17 00:00:00 2001 From: Andrew Trick Date: Wed, 2 Aug 2017 00:50:29 -0700 Subject: [PATCH] Revert "linux: update header used for `major` macro" --- CMakeLists.txt | 1 - cmake/config.h.in | 3 --- os/linux_base.h | 5 ----- 3 files changed, 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3cb3676bd..5d9e470fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -160,7 +160,6 @@ check_include_files("sys/cdefs.h" HAVE_SYS_CDEFS_H) check_include_files("sys/guarded.h" HAVE_SYS_GUARDED_H) check_include_files("sys/stat.h" HAVE_SYS_STAT_H) check_include_files("sys/types.h" HAVE_SYS_TYPES_H) -check_include_files("sys/sysmacros.h" HAVE_SYS_SYSMACROS_H) check_include_files("unistd.h" HAVE_UNISTD_H) check_include_files("objc/objc-internal.h" HAVE_OBJC) diff --git a/cmake/config.h.in b/cmake/config.h.in index 3a3245f9a..6696e9863 100644 --- a/cmake/config.h.in +++ b/cmake/config.h.in @@ -188,9 +188,6 @@ /* Define to 1 if you have the header file. */ #cmakedefine01 HAVE_SYS_TYPES_H -/* Define to 1 if you have the header file. */ -#cmakedefine01 HAVE_SYS_SYSMACROS_H - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_TARGETCONDITIONALS_H diff --git a/os/linux_base.h b/os/linux_base.h index f1e72bf09..c8b9cad7c 100644 --- a/os/linux_base.h +++ b/os/linux_base.h @@ -13,11 +13,6 @@ #ifndef __OS_LINUX_BASE__ #define __OS_LINUX_BASE__ -#include - -#if HAVE_SYS_SYSMACROS_H -#include -#endif #include #if HAVE_SYS_CDEFS_H