Fix compilation with --disable-own-window (sf.net #2820716)

diff --git a/src/conky.c b/src/conky.c
index 21a4531..723c0c4 100644 (file)
--- 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 (file)
--- 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 */