Merge branch 'obsd-master'

tmux.c

@@ -56,7 +56,7 @@ usage(void)
 	fprintf(stderr,
 	    "usage: %s [-2CluvV] [-c shell-command] [-f file] [-L socket-name]\n"
 	    "            [-S socket-path] [command [flags]]\n",
-	    __progname);
+	    getprogname());
 	exit(1);
 }
 
@@ -98,7 +98,7 @@ areshell(const char *shell)
 		ptr++;
 	else
 		ptr = shell;
-	progname = __progname;
+	progname = getprogname();
 	if (*progname == '-')
 		progname++;
 	if (strcmp(ptr, progname) == 0)

tmux.h

@@ -38,7 +38,6 @@
 #include "compat.h"
 #include "xmalloc.h"
 
-extern char    *__progname;
 extern char   **environ;
 
 struct client;