Get basic Wayland support working

[wmpus] / util.h

diff --git a/util.h b/util.h
index 697ca9ce04a2b387abe0f55dd90b9e2bbba2172e..ccca871c8afeebb62dee153634e5dbd09b6f12c1 100644 (file)
--- a/util.h
+++ b/util.h
@@ -16,8 +16,10 @@
 /* Various utility functions */
 
 /* Misc macros */
+#if !defined(MAX) && !defined(MIN)
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
+#endif
 
 #define new0(type) (calloc(1, sizeof(type)))
 
@@ -55,5 +57,9 @@ list_t *list_last(list_t *list);
 
 list_t *list_find(list_t *list, void *data);
 
+list_t *list_sort(list_t *list, int rev, int (*func)(void*,void*));
+
 /* Misc */
+int str2num(char *str, int def);
+
 int error(char *fmt, ...);