diff --git a/proc.c b/proc.c index feac15173..5ed0a5175 100644 --- a/proc.c +++ b/proc.c @@ -190,7 +190,6 @@ proc_start(const char *name, struct event_base *base, int forkflag, } log_open(name); - setproctitle("%s (%s)", name, socket_path); if (uname(&u) < 0) diff --git a/tools/cmp-cvs.sh b/tools/cmp-cvs.sh index 5429d769b..048ad15ca 100644 --- a/tools/cmp-cvs.sh +++ b/tools/cmp-cvs.sh @@ -4,7 +4,7 @@ rm diff.out touch diff.out for i in *.[ch]; do - diff -u $i /usr/src/usr.bin/tmux/$i >diff.tmp + diff -u -I'\$OpenBSD' $i /usr/src/usr.bin/tmux/$i >diff.tmp set -- `wc -l diff.tmp` [ $1 -eq 8 ] && continue echo $i diff --git a/xmalloc.h b/xmalloc.h index 0360b0d9d..61f8adef5 100644 --- a/xmalloc.h +++ b/xmalloc.h @@ -20,7 +20,7 @@ #define XMALLOC_H #if !defined(__bounded__) -# define __bounded__(x, y, z) +#define __bounded__(x, y, z) #endif void *xmalloc(size_t);