zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hishamhm-pull-866'

This commit is contained in:
Nathan Scott 2020-08-20 12:29:25 +10:00
parent ed2b7791df 41754e5632
commit 45ae6191c1
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Process.c
View File

@ -31,8 +31,7 @@ in the source distribution for its full text.
#include <math.h> #include <math.h>
#ifdef MAJOR_IN_MKDEV #ifdef MAJOR_IN_MKDEV
#include <sys/mkdev.h> #include <sys/mkdev.h>
#elif defined(MAJOR_IN_SYSMACROS) || \ #elif defined(MAJOR_IN_SYSMACROS)
(defined(HAVE_SYS_SYSMACROS_H) && HAVE_SYS_SYSMACROS_H)
#include <sys/sysmacros.h> #include <sys/sysmacros.h>
#endif #endif

3
Process.h
View File

@ -11,8 +11,7 @@ in the source distribution for its full text.
*/ */
#ifdef MAJOR_IN_MKDEV #ifdef MAJOR_IN_MKDEV
#elif defined(MAJOR_IN_SYSMACROS) || \ #elif defined(MAJOR_IN_SYSMACROS)
(defined(HAVE_SYS_SYSMACROS_H) && HAVE_SYS_SYSMACROS_H)
#endif #endif
#ifdef __ANDROID__ #ifdef __ANDROID__

3
linux/LinuxProcessList.c
View File

@ -28,8 +28,7 @@ in the source distribution for its full text.
#include <fcntl.h> #include <fcntl.h>
#ifdef MAJOR_IN_MKDEV #ifdef MAJOR_IN_MKDEV
#include <sys/mkdev.h> #include <sys/mkdev.h>
#elif defined(MAJOR_IN_SYSMACROS) || \ #elif defined(MAJOR_IN_SYSMACROS)
(defined(HAVE_SYS_SYSMACROS_H) && HAVE_SYS_SYSMACROS_H)
#include <sys/sysmacros.h> #include <sys/sysmacros.h>
#endif #endif

3
linux/LinuxProcessList.h
View File

@ -10,8 +10,7 @@ in the source distribution for its full text.
*/ */
#ifdef MAJOR_IN_MKDEV #ifdef MAJOR_IN_MKDEV
#elif defined(MAJOR_IN_SYSMACROS) || \ #elif defined(MAJOR_IN_SYSMACROS)
(defined(HAVE_SYS_SYSMACROS_H) && HAVE_SYS_SYSMACROS_H)
#endif #endif
#ifdef HAVE_DELAYACCT #ifdef HAVE_DELAYACCT