mirror of https://github.com/xzeldon/htop.git
Merge branch 'hishamhm-pull-866'
This commit is contained in:
commit
45ae6191c1
|
@ -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__
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue