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

Fix building without X11 after commit 20d4c4370a

Browse Source
This commit is contained in:
Nikolas Garofil 2009-07-17 18:37:46 +02:00
parent 20d4c4370a
commit e905c7d4f1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/conky.c
View File

@ -7408,7 +7408,9 @@ static void main_loop(void)
} }
static void load_config_file(const char *); static void load_config_file(const char *);
#ifdef X11
static void load_config_file_x11(const char *); static void load_config_file_x11(const char *);
#endif /* X11 */
void initialisation(int argc, char** argv); void initialisation(int argc, char** argv);
/* reload the config file */ /* reload the config file */
@ -8693,6 +8695,7 @@ static void load_config_file(const char *f)
} }
} }
#ifdef X11
static void load_config_file_x11(const char *f) static void load_config_file_x11(const char *f)
{ {
int line = 0; int line = 0;
@ -8713,7 +8716,6 @@ static void load_config_file_x11(const char *f)
continue; continue;
} }
#ifdef X11
CONF2("color0") { CONF2("color0") {
X11_initialisation(); X11_initialisation();
if (x_initialised == YES) { if (x_initialised == YES) {
@ -8863,7 +8865,6 @@ static void load_config_file_x11(const char *f)
X11_initialisation(); X11_initialisation();
} }
} }
#endif /* X11 */
#undef CONF #undef CONF
#undef CONF2 #undef CONF2
#undef CONF3 #undef CONF3
@ -8877,6 +8878,7 @@ static void load_config_file_x11(const char *f)
fclose(fp); fclose(fp);
} }
#endif /* X11 */
static void print_help(const char *prog_name) { static void print_help(const char *prog_name) {
printf("Usage: %s [OPTION]...\n" printf("Usage: %s [OPTION]...\n"