diff options
author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2014-03-08 16:28:56 +0000 |
---|---|---|
committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2014-03-08 16:28:56 +0000 |
commit | 77603c4f2de1961b3da141b3e6e4ce2f983365d4 (patch) | |
tree | 4ea1533af8574a91a074fbebea204380f5e00dc8 /tmux.h | |
parent | 7019f77c05f45ea9267f7e768d0abb0b6a928a25 (diff) | |
parent | 9880114aff0b48649f00266125da1dc3c94a70eb (diff) | |
download | rtmux-77603c4f2de1961b3da141b3e6e4ce2f983365d4.tar.gz rtmux-77603c4f2de1961b3da141b3e6e4ce2f983365d4.tar.bz2 rtmux-77603c4f2de1961b3da141b3e6e4ce2f983365d4.zip |
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Diffstat (limited to 'tmux.h')
-rw-r--r-- | tmux.h | 16 |
1 files changed, 1 insertions, 15 deletions
@@ -660,16 +660,6 @@ struct utf8_data { u_int width; }; -/* Grid output. */ -#if defined(DEBUG) && \ - ((defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \ - (defined(__GNUC__) && __GNUC__ >= 3)) -#define GRID_DEBUG(gd, fmt, ...) log_debug2("%s: (sx=%u, sy=%u, hsize=%u) " \ - fmt, __func__, (gd)->sx, (gd)->sy, (gd)->hsize, ## __VA_ARGS__) -#else -#define GRID_DEBUG(...) -#endif - /* Grid attributes. */ #define GRID_ATTR_BRIGHT 0x1 #define GRID_ATTR_DIM 0x2 @@ -2340,13 +2330,9 @@ char *osdep_get_cwd(int); struct event_base *osdep_event_init(void); /* log.c */ -void log_open(int, const char *); +void log_open(const char *); void log_close(void); -void printflike1 log_warn(const char *, ...); -void printflike1 log_warnx(const char *, ...); -void printflike1 log_info(const char *, ...); void printflike1 log_debug(const char *, ...); -void printflike1 log_debug2(const char *, ...); __dead void printflike1 log_fatal(const char *, ...); __dead void printflike1 log_fatalx(const char *, ...); |