Mac OS X fixes: include string.h, add strndup(), disable xmllint for the docs

diff --git a/i3bar/doc/Makefile b/i3bar/doc/Makefile
index a8144cd84193114d8817698957351bdf2104d124..695667507e7263b3f9906f7e3c4dc92cdf23b24a 100644 (file)
--- a/i3bar/doc/Makefile
+++ b/i3bar/doc/Makefile
@@ -2,7 +2,7 @@ all: i3bar.1
 
 i3bar.1: i3bar.man
        echo "A2X i3bar"
-       a2x -f manpage i3bar.man
+       a2x --no-xmllint -f manpage i3bar.man
 clean:
        rm -f i3bar.xml i3bar.1 i3bar.html
 

diff --git a/i3bar/src/ipc.c b/i3bar/src/ipc.c
index 85cd234f98619fb3f942453ad769b2349b721acf..7769fdb18812d88667175156043794900b3afb5b 100644 (file)
--- a/i3bar/src/ipc.c
+++ b/i3bar/src/ipc.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <stdint.h>
+#include <string.h>
 #include <errno.h>
 #include <sys/socket.h>
 #include <sys/un.h>

diff --git a/i3bar/src/xcb.c b/i3bar/src/xcb.c
index 62160f405ffd23114f74c17abe8df1cbb436d9cb..b8ab5ed2e3b9af28d77a29a93a17aac88d167322 100644 (file)
--- a/i3bar/src/xcb.c
+++ b/i3bar/src/xcb.c
@@ -27,6 +27,30 @@
 
 #include "common.h"
 
+#if defined(__APPLE__)
+
+/*
+ * Taken from FreeBSD
+ * Returns a pointer to a new string which is a duplicate of the
+ * string, but only copies at most n characters.
+ *
+ */
+char *strndup(const char *str, size_t n) {
+    size_t len;
+    char *copy;
+
+    for (len = 0; len < n && str[len]; len++)
+        continue;
+
+    if ((copy = malloc(len + 1)) == NULL)
+        return (NULL);
+    memcpy(copy, str, len);
+    copy[len] = '\0';
+    return (copy);
+}
+
+#endif
+
 /* We save the Atoms in an easy to access array, indexed by an enum */
 enum {
     #define ATOM_DO(name) name,