1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-25 04:06:03 +00:00

fixed compilation with --disable-x11

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1041 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Brenden Matthews 2008-03-23 17:26:41 +00:00
parent cdee40b511
commit 902ff4ca5c
2 changed files with 5 additions and 2 deletions

View File

@ -1,5 +1,8 @@
# $Id$ # $Id$
2008-03-23
* Fixed compilation with --disable-x11
2008-03-22 2008-03-22
* Conky 1.5.0 released * Conky 1.5.0 released
* Smapi review: improved code, fixed memleaks and smapi_bat_perc when * Smapi review: improved code, fixed memleaks and smapi_bat_perc when

View File

@ -127,6 +127,8 @@ static void print_version()
exit(0); exit(0);
} }
static char *suffixes[] = { "B", "kiB", "MiB", "GiB", "TiB", "PiB", "" };
#ifdef X11 #ifdef X11
/* text size */ /* text size */
@ -164,8 +166,6 @@ static int selected_font = 0;
static int font_count = -1; static int font_count = -1;
struct font_list *fonts = NULL; struct font_list *fonts = NULL;
static char *suffixes[] = { "B", "kiB", "MiB", "GiB", "TiB", "PiB", "" };
#ifdef XFT #ifdef XFT
#define font_height() (use_xft ? (fonts[selected_font].xftfont->ascent + \ #define font_height() (use_xft ? (fonts[selected_font].xftfont->ascent + \