mirror of
https://github.com/Llewellynvdm/conky.git
synced 2024-12-26 04:17:33 +00:00
recent linux kernels don't define certain major numbers; add them if not defined
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@198 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
parent
c74fadac6c
commit
dc6ac8edaf
24
src/linux.c
24
src/linux.c
@ -29,8 +29,6 @@
|
|||||||
#include <net/if.h>
|
#include <net/if.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
|
||||||
#include <linux/major.h>
|
|
||||||
|
|
||||||
static struct sysinfo s_info;
|
static struct sysinfo s_info;
|
||||||
|
|
||||||
static int show_nice_processes;
|
static int show_nice_processes;
|
||||||
@ -1088,6 +1086,28 @@ void update_top()
|
|||||||
process_find_top(info.cpu, info.memu);
|
process_find_top(info.cpu, info.memu);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of gkrellm
|
||||||
|
* Copyright (C) 1999-2005 Bill Wilson
|
||||||
|
*
|
||||||
|
* Licensed under the terms of the GNU GPL License version 2.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <linux/major.h>
|
||||||
|
|
||||||
|
#if ! defined (MD_MAJOR)
|
||||||
|
#define MD_MAJOR 9
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if !defined(LVM_BLK_MAJOR)
|
||||||
|
#define LVM_BLK_MAJOR 58
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if !defined(NBD_MAJOR)
|
||||||
|
#define NBD_MAJOR 43
|
||||||
|
#endif
|
||||||
|
|
||||||
void update_diskio()
|
void update_diskio()
|
||||||
{
|
{
|
||||||
static unsigned int last = UINT_MAX;
|
static unsigned int last = UINT_MAX;
|
||||||
|
Loading…
Reference in New Issue
Block a user