shithub: microui

Info  •  Files  •  Log  •  Branches

fix compilation on Plan 9; add "-D__plan9__ -p" to CFLAGS

--- a/src/microui.c

+++ b/src/microui.c

@@ -20,13 +20,23 @@

 ** IN THE SOFTWARE.

 */

+#ifdef __plan9__

+#include <u.h>

+#include <libc.h>

+#define unused USED

+#define NULL nil

+#define sprintf sprint

+#define vsnprintf vsnprint

+#define fprintf fprint

+#define stderr 2

+#else

 #include <stdio.h>

 #include <string.h>

+#define unused(x) ((void) (x))

+#endif

 #include "microui.h"

-#define unused(x) ((void) (x))

-

 #define expect(x) do {                                               \

     if (!(x)) {                                                      \

       fprintf(stderr, "Fatal error: %s:%d: assertion '%s' failed\n", \

@@ -554,7 +564,10 @@

     int type = layout->next_type;

     layout->next_type = 0;

     res = layout->next;

-    if (type == ABSOLUTE) { return (ctx->last_rect = res); }

+    if (type == ABSOLUTE) {

+      ctx->last_rect = res;

+      return res;

+    }

   } else {

     /* handle next row */

@@ -590,7 +603,8 @@

   layout->max.x = mu_max(layout->max.x, res.x + res.w);

   layout->max.y = mu_max(layout->max.y, res.y + res.h);

-  return (ctx->last_rect = res);

+  ctx->last_rect = res;

+  return res;

 }