diff options
author | Nathan Scott <nathans@redhat.com> | 2020-08-20 12:29:25 +1000 |
---|---|---|
committer | Nathan Scott <nathans@redhat.com> | 2020-08-20 12:29:25 +1000 |
commit | 45ae6191c1bd1013d25eb3e49ef174f311d2e1f7 (patch) | |
tree | a4fd427374db666f08dfc3ebeb54caaec2c01ffc | |
parent | ed2b7791df80adb394a7fcd9e83ed690ef5081f5 (diff) | |
parent | 41754e56329522dac9f05f4ebefb436908b27fdc (diff) |
Merge branch 'hishamhm-pull-866'
-rw-r--r-- | Process.c | 3 | ||||
-rw-r--r-- | Process.h | 3 | ||||
-rw-r--r-- | linux/LinuxProcessList.c | 3 | ||||
-rw-r--r-- | linux/LinuxProcessList.h | 3 |
4 files changed, 4 insertions, 8 deletions
@@ -31,8 +31,7 @@ in the source distribution for its full text. #include <math.h> #ifdef MAJOR_IN_MKDEV #include <sys/mkdev.h> -#elif defined(MAJOR_IN_SYSMACROS) || \ - (defined(HAVE_SYS_SYSMACROS_H) && HAVE_SYS_SYSMACROS_H) +#elif defined(MAJOR_IN_SYSMACROS) #include <sys/sysmacros.h> #endif @@ -11,8 +11,7 @@ in the source distribution for its full text. */ #ifdef MAJOR_IN_MKDEV -#elif defined(MAJOR_IN_SYSMACROS) || \ - (defined(HAVE_SYS_SYSMACROS_H) && HAVE_SYS_SYSMACROS_H) +#elif defined(MAJOR_IN_SYSMACROS) #endif #ifdef __ANDROID__ diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c index 0f756b35..c6ab4807 100644 --- a/linux/LinuxProcessList.c +++ b/linux/LinuxProcessList.c @@ -28,8 +28,7 @@ in the source distribution for its full text. #include <fcntl.h> #ifdef MAJOR_IN_MKDEV #include <sys/mkdev.h> -#elif defined(MAJOR_IN_SYSMACROS) || \ - (defined(HAVE_SYS_SYSMACROS_H) && HAVE_SYS_SYSMACROS_H) +#elif defined(MAJOR_IN_SYSMACROS) #include <sys/sysmacros.h> #endif diff --git a/linux/LinuxProcessList.h b/linux/LinuxProcessList.h index 042202e1..850f5733 100644 --- a/linux/LinuxProcessList.h +++ b/linux/LinuxProcessList.h @@ -10,8 +10,7 @@ in the source distribution for its full text. */ #ifdef MAJOR_IN_MKDEV -#elif defined(MAJOR_IN_SYSMACROS) || \ - (defined(HAVE_SYS_SYSMACROS_H) && HAVE_SYS_SYSMACROS_H) +#elif defined(MAJOR_IN_SYSMACROS) #endif #ifdef HAVE_DELAYACCT |