The branch, master has been updated
via 46b3c1a02564268ab810d0f54190f1e8fc1f4f6d (commit)
from 3ea893464f0deb382a41dbab6a4de12c008a4fd9 (commit)
- Log -----------------------------------------------------------------
commit 46b3c1a02564268ab810d0f54190f1e8fc1f4f6d
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Commit: Nicholas Marriott <nicholas.marri...@gmail.com>
Use proc_bsdinfo which works on older OS X versions, from OZAKI Kiichi.
---
osdep-darwin.c | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/osdep-darwin.c b/osdep-darwin.c
index 3b5e9d3..dc60b09 100644
--- a/osdep-darwin.c
+++ b/osdep-darwin.c
@@ -18,7 +18,6 @@
#include <sys/types.h>
-#include <Availability.h>
#include <event.h>
#include <libproc.h>
#include <stdlib.h>
@@ -34,19 +33,17 @@ struct event_base *osdep_event_init(void);
char *
osdep_get_name(int fd, unused char *tty)
{
-#ifdef __MAC_10_7
- struct proc_bsdshortinfo bsdinfo;
+ struct proc_bsdinfo bsdinfo;
pid_t pgrp;
int ret;
if ((pgrp = tcgetpgrp(fd)) == -1)
return (NULL);
- ret = proc_pidinfo(pgrp, PROC_PIDT_SHORTBSDINFO, 0,
+ ret = proc_pidinfo(pgrp, PROC_PIDTBSDINFO, 0,
&bsdinfo, sizeof bsdinfo);
- if (ret == sizeof bsdinfo && *bsdinfo.pbsi_comm != '\0')
- return (strdup(bsdinfo.pbsi_comm));
-#endif
+ if (ret == sizeof bsdinfo && *bsdinfo.pbi_comm != '\0')
+ return (strdup(bsdinfo.pbi_comm));
return (NULL);
}
-----------------------------------------------------------------------
Summary of changes:
osdep-darwin.c | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Precog is a next-generation analytics platform capable of advanced
analytics on semi-structured data. The platform includes APIs for building
apps and a phenomenal toolset for data science. Developers can use
our toolset for easy data analysis & visualization. Get a free account!
http://www2.precog.com/precogplatform/slashdotnewsletter
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
