From 1bf524c1b7742caa843ac94131f175d19c8ca4e2 Mon Sep 17 00:00:00 2001
From: Tiago Cunha <tcunha@gmx.com>
Date: Wed, 22 Jul 2009 16:53:30 +0000
Subject: [PATCH] Sync OpenBSD patchset 152:

__progname is not const, pointed out by deraadt.

And, as a consequence change its declaration for operating systems which
don't provide __progname as well.
---
 tmux.c | 4 ++--
 tmux.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tmux.c b/tmux.c
index 1fa6996c..57b00a44 100644
--- a/tmux.c
+++ b/tmux.c
@@ -1,4 +1,4 @@
-/* $Id: tmux.c,v 1.147 2009-07-20 16:07:23 tcunha Exp $ */
+/* $Id: tmux.c,v 1.148 2009-07-22 16:53:30 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -64,7 +64,7 @@ __dead void	 usage(void);
 char 		*makesockpath(const char *);
 
 #ifndef HAVE_PROGNAME
-const char      *__progname = "tmux";
+char      *__progname = (char *) "tmux";
 #endif
 
 __dead void
diff --git a/tmux.h b/tmux.h
index b2d43428..8fc993ec 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1,4 +1,4 @@
-/* $Id: tmux.h,v 1.375 2009-07-22 16:24:59 tcunha Exp $ */
+/* $OpenBSD: tmux.h,v 1.42 2009/07/21 18:38:52 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -37,7 +37,7 @@
 
 #include "compat.h"
 
-extern const char    *__progname;
+extern char    *__progname;
 
 /* Default configuration files. */
 #define DEFAULT_CFG ".tmux.conf"