Add missing MAX macros, ensure that i3 can be compiled without pango

diff --git a/libi3/font.c b/libi3/font.c
index 5a2504fa2024bcddecdff993f230e7d5320bfc75..00e7dfb30b4785f8ec6b0f8bc8a6a67d61c08aff 100644 (file)
--- a/libi3/font.c
+++ b/libi3/font.c
@@ -397,9 +397,11 @@ static void draw_text_xcb(const xcb_char2b_t *text, size_t text_len, xcb_drawabl
 void draw_text(i3String *text, xcb_drawable_t drawable, xcb_gcontext_t gc,
                xcb_visualtype_t *visual, int x, int y, int max_width) {
     assert(savedFont != NULL);
+#if PANGO_SUPPORT
     if (visual == NULL) {
         visual = root_visual_type;
     }
+#endif
 
     switch (savedFont->type) {
         case FONT_TYPE_NONE:

diff --git a/src/floating.c b/src/floating.c
index 231577fd5edf4c5ac83888db12616e45cce95b4f..65a2810a881a1a0c0bbf414b521e3ece59ec0e92 100644 (file)
--- a/src/floating.c
+++ b/src/floating.c
@@ -11,6 +11,10 @@
  */
 #include "all.h"
 
+#ifndef MAX
+#define MAX(x, y) ((x) > (y) ? (x) : (y))
+#endif
+
 /*
  * Calculates sum of heights and sum of widths of all currently active outputs
  *

diff --git a/src/util.c b/src/util.c
index 35ce8b19334c07ded42e6bfe94eb4dd54eddf75a..53f78d72d64cce627256e183eff1d86965306051 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -341,10 +341,12 @@ char *pango_escape_markup(char *input) {
     if (!font_is_pango())
         return input;
 
+#if PANGO_SUPPORT
     char *escaped = g_markup_escape_text(input, -1);
     FREE(input);
 
     return escaped;
+#endif
 }
 
 /*

diff --git a/src/x.c b/src/x.c
index f44bc37a9f7dffb3d2378b8e99776f25be3dcb88..43db952dae9b77cf5dc8420988793a66c1fa1f4c 100644 (file)
--- a/src/x.c
+++ b/src/x.c
@@ -12,6 +12,10 @@
  */
 #include "all.h"
 
+#ifndef MAX
+#define MAX(x, y) ((x) > (y) ? (x) : (y))
+#endif
+
 xcb_window_t ewmh_window;
 
 /* Stores the X11 window ID of the currently focused window */