===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/format.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- src/usr.bin/tmux/format.c	2012/05/22 11:35:37	1.8
+++ src/usr.bin/tmux/format.c	2012/07/10 11:53:01	1.9
@@ -1,4 +1,4 @@
-/* $OpenBSD: format.c,v 1.8 2012/05/22 11:35:37 nicm Exp $ */
+/* $OpenBSD: format.c,v 1.9 2012/07/10 11:53:01 nicm Exp $ */
 
 /*
  * Copyright (c) 2011 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -20,6 +20,7 @@
 
 #include <netdb.h>
 #include <stdarg.h>
+#include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
@@ -102,12 +103,12 @@
 		fe_next = RB_NEXT(format_tree, ft, fe);
 
 		RB_REMOVE(format_tree, ft, fe);
-		xfree(fe->value);
-		xfree(fe->key);
-		xfree(fe);
+		free(fe->value);
+		free(fe->key);
+		free(fe);
 	}
 
-	xfree (ft);
+	free (ft);
 }
 
 /* Add a key-value pair. */
@@ -195,11 +196,11 @@
 	memcpy(*buf + *off, value, valuelen);
 	*off += valuelen;
 
-	xfree(copy);
+	free(copy);
 	return (0);
 
 fail:
-	xfree(copy);
+	free(copy);
 	return (-1);
 }
 
@@ -351,8 +352,8 @@
 	format_add(ft, "window_active", "%d", wl == s->curw);
 	format_add(ft, "window_panes", "%u", window_count_panes(w));
 
-	xfree(flags);
-	xfree(layout);
+	free(flags);
+	free(layout);
 }
 
 /* Set default format keys for a window pane. */
@@ -403,5 +404,5 @@
 	format_add(ft, "buffer_size", "%zu", pb->size);
 	format_add(ft, "buffer_sample", "%s", pb_print);
 
-	xfree(pb_print);
+	free(pb_print);
 }