mirror of
https://github.com/tmux/tmux.git
synced 2025-04-29 01:08:49 +00:00
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.
This commit is contained in:
parent
a734488a4b
commit
1bf524c1b7
4
tmux.c
4
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>
|
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||||
@ -64,7 +64,7 @@ __dead void usage(void);
|
|||||||
char *makesockpath(const char *);
|
char *makesockpath(const char *);
|
||||||
|
|
||||||
#ifndef HAVE_PROGNAME
|
#ifndef HAVE_PROGNAME
|
||||||
const char *__progname = "tmux";
|
char *__progname = (char *) "tmux";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
__dead void
|
__dead void
|
||||||
|
4
tmux.h
4
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>
|
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||||
@ -37,7 +37,7 @@
|
|||||||
|
|
||||||
#include "compat.h"
|
#include "compat.h"
|
||||||
|
|
||||||
extern const char *__progname;
|
extern char *__progname;
|
||||||
|
|
||||||
/* Default configuration files. */
|
/* Default configuration files. */
|
||||||
#define DEFAULT_CFG ".tmux.conf"
|
#define DEFAULT_CFG ".tmux.conf"
|
||||||
|
Loading…
Reference in New Issue
Block a user