circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-05 16:27:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	Makefile
	tmux.c
This commit is contained in:
Thomas Adam
2017-01-23 12:20:43 +00:00
parent d2eab39ffa 98e7fbb2ac
commit b3a724f30c
6 changed files with 79 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tmux.h
View File

@ -1503,6 +1503,7 @@ extern struct options *global_w_options;
extern struct environ *global_environ;
extern struct timeval start_time;
extern const char *socket_path;
extern int ptm_fd;
int areshell(const char *);
void setblocking(int, int);
const char *find_home(void);
@ -2333,4 +2334,8 @@ void style_apply_update(struct grid_cell *, struct options *,
int style_equal(const struct grid_cell *,
const struct grid_cell *);
/* pty.c */
int pty_open(int *);
pid_t pty_fork(int, int *, char *, size_t, struct winsize *);
#endif /* TMUX_H */