summaryrefslogtreecommitdiffstats
path: root/tmux.h
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2007-07-25 23:13:18 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2007-07-25 23:13:18 +0000
commit4b62b1d16caec36c4c843108c40cde25f9aa64e4 (patch)
tree04559a4d50e22759417f5109f1d8bf3535f105cc /tmux.h
parenta3bfe208b3ccea28676917d3b41fb575b19484ef (diff)
Sync with fdm.
Diffstat (limited to 'tmux.h')
-rw-r--r--tmux.h23
1 files changed, 20 insertions, 3 deletions
diff --git a/tmux.h b/tmux.h
index 962ed98c..7a80956c 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1,4 +1,4 @@
-/* $Id: tmux.h,v 1.1.1.1 2007-07-09 19:03:50 nicm Exp $ */
+/* $Id: tmux.h,v 1.2 2007-07-25 23:13:18 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -20,6 +20,7 @@
#define NSCR_H
#include <sys/param.h>
+#include <sys/tree.h>
#include <sys/queue.h>
#include <poll.h>
@@ -30,8 +31,12 @@
extern char *__progname;
-#define MAXNAMELEN 32
-#define MAXTITLELEN 192
+#define MAXNAMELEN 32
+#define MAXTITLELEN 192
+
+/* Fatal errors. */
+#define fatal(msg) log_fatal("%s: %s", __func__, msg);
+#define fatalx(msg) log_fatal("%s: %s", __func__, msg);
/* Definition to shut gcc up about unused arguments. */
#define unused __attribute__ ((unused))
@@ -580,4 +585,16 @@ int printflike3 printpath(char *, size_t, const char *, ...);
char *xdirname(const char *);
char *xbasename(const char *);
+/* xmalloc-debug.c */
+#ifdef DEBUG
+#define xmalloc_caller() __builtin_return_address(0)
+
+void xmalloc_clear(void);
+void xmalloc_report(pid_t, const char *);
+
+void xmalloc_new(void *, void *, size_t);
+void xmalloc_change(void *, void *, void *, size_t);
+void xmalloc_free(void *);
+#endif
+
#endif