Merge branch 'hishamhm-pull-866'

4 files changed, 4 insertions, 8 deletions

diff --git a/Process.c b/Process.c
index 391fbb3e..0792b776 100644
--- a/Process.c
+++ b/Process.c
@@ -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
 
diff --git a/Process.h b/Process.h
index 604c754a..56a4dba1 100644
--- a/Process.h
+++ b/Process.h
@@ -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