Resolved conflict, indulging new file layout

1 files changed, 9 insertions, 0 deletions

diff --git a/core/dmenu/util.h b/core/dmenu/util.h
new file mode 100644
index 0000000..c0a50d4
--- /dev/null
+++ b/core/dmenu/util.h
@@ -0,0 +1,9 @@
+/* See LICENSE file for copyright and license details. */
+
+#define MAX(A, B)               ((A) > (B) ? (A) : (B))
+#define MIN(A, B)               ((A) < (B) ? (A) : (B))
+#define BETWEEN(X, A, B)        ((A) <= (X) && (X) <= (B))
+#define LENGTH(X)               (sizeof (X) / sizeof (X)[0])
+
+void die(const char *fmt, ...);
+void *ecalloc(size_t nmemb, size_t size);