Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-17 18:45:10 +00:00
Code Issues Releases Activity

fixed compilation errors with --disable-x11; bug #1547164

Browse Source 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@697 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Philip Kovacs 2006-08-27 19:03:52 +00:00
parent 78a52eaf0b
commit 681fb80260
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
# $Id$ # $Id$
2006-08-27
* Fix compilation errors when building with --diable-x11; bug #1547164
2006-08-12 2006-08-12
* Make configure script print summary info * Make configure script print summary info
* Make `conky -v` show compiled-in features * Make `conky -v` show compiled-in features

4
README
View File

@ -474,8 +474,8 @@ VARIABLES
cpu (cpuN) cpu (cpuN)
CPU usage in percents. For SMP machines, the CPU number can be CPU usage in percents. For SMP machines, the CPU number can be
provided as an argument. cpu0 is the total usage, and >=cpu1 are provided as an argument. ${cpu 0} is the total usage, and ${cpu
individual CPUs. X} (X >= 1) are individual CPUs.
cpubar (cpu number) (height),(width) cpubar (cpu number) (height),(width)

2
doc/conky.1
View File

@ -446,7 +446,7 @@ Change drawing color to color
.TP .TP
\fB\*(T<\fBcpu\fR\*(T>\fR \*(T<\fB(cpuN)\fR\*(T> \fB\*(T<\fBcpu\fR\*(T>\fR \*(T<\fB(cpuN)\fR\*(T>
CPU usage in percents. For SMP machines, the CPU number can be provided as an argument. cpu0 is the total usage, and >=cpu1 are individual CPUs. CPU usage in percents. For SMP machines, the CPU number can be provided as an argument. ${cpu 0} is the total usage, and ${cpu X} (X >= 1) are individual CPUs.
.TP .TP
\fB\*(T<\fBcpubar\fR\*(T>\fR \*(T<\fB(cpu number) (height),(width)\fR\*(T> \fB\*(T<\fBcpubar\fR\*(T>\fR \*(T<\fB(cpu number) (height),(width)\fR\*(T>

4
src/conky.c
View File

@ -328,7 +328,7 @@ static int fixed_size = 0, fixed_pos = 0;
static int minimum_width, minimum_height; static int minimum_width, minimum_height;
static int maximum_width; static int maximum_width;
#endif /* X11 */
#ifdef HAVE_ICONV #ifdef HAVE_ICONV
#define CODEPAGE_LENGTH 20 #define CODEPAGE_LENGTH 20
@ -376,8 +376,6 @@ void free_iconv(void)
/* UTF-8 */ /* UTF-8 */
int utf8_mode = 0; int utf8_mode = 0;
#endif /* X11 */
/* no buffers in used memory? */ /* no buffers in used memory? */
int no_buffers; int no_buffers;