From 602edfea15c28f8c7a618cdd47179262568c3d8b Mon Sep 17 00:00:00 2001 From: Cesare Tirabassi Date: Mon, 13 Jul 2009 23:19:32 +0200 Subject: [PATCH] Fix compilation with --disable-own-window (sf.net #2820716) --- src/conky.c | 5 ++++- src/x11.c | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/conky.c b/src/conky.c index 21a4531..723c0c4 100644 --- a/src/conky.c +++ b/src/conky.c @@ -8012,9 +8012,12 @@ static void load_config_file(const char *f) } } CONF("alignment") { +#ifdef OWN_WINDOW if (window.type == TYPE_DOCK) ; - else if (value) { + else +#endif /*OWN_WINDOW */ + if (value) { int a = string_to_alignment(value); if (a <= 0) { diff --git a/src/x11.c b/src/x11.c index e86e96b..eb0cf1f 100644 --- a/src/x11.c +++ b/src/x11.c @@ -626,6 +626,7 @@ void update_x11info(void) } +#ifdef OWN_WINDOW /* reserve window manager space */ void set_struts(int sidenum) { @@ -698,3 +699,4 @@ void set_struts(int sidenum) } } } +#endif /* OWN_WINDOW */ -- 1.7.9.5