summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--usr.bin/tmux/options.c4
-rw-r--r--usr.bin/tmux/style.c6
-rw-r--r--usr.bin/tmux/tmux.h4
3 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/tmux/options.c b/usr.bin/tmux/options.c
index 9fe2735da0a..bfc2d10c678 100644
--- a/usr.bin/tmux/options.c
+++ b/usr.bin/tmux/options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: options.c,v 1.23 2017/01/13 11:56:43 nicm Exp $ */
+/* $OpenBSD: options.c,v 1.24 2017/01/13 11:58:49 nicm Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -221,7 +221,7 @@ options_set_style(struct options *oo, const char *name, int append,
return (o);
}
-struct grid_cell *
+const struct grid_cell *
options_get_style(struct options *oo, const char *name)
{
struct options_entry *o;
diff --git a/usr.bin/tmux/style.c b/usr.bin/tmux/style.c
index 9c19c09c716..a9db8f2d030 100644
--- a/usr.bin/tmux/style.c
+++ b/usr.bin/tmux/style.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: style.c,v 1.11 2017/01/12 15:36:35 nicm Exp $ */
+/* $OpenBSD: style.c,v 1.12 2017/01/13 11:58:49 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -182,7 +182,7 @@ style_update_old(struct options *oo, const char *name, struct grid_cell *gc)
void
style_apply(struct grid_cell *gc, struct options *oo, const char *name)
{
- struct grid_cell *gcp;
+ const struct grid_cell *gcp;
memcpy(gc, &grid_default_cell, sizeof *gc);
gcp = options_get_style(oo, name);
@@ -195,7 +195,7 @@ style_apply(struct grid_cell *gc, struct options *oo, const char *name)
void
style_apply_update(struct grid_cell *gc, struct options *oo, const char *name)
{
- struct grid_cell *gcp;
+ const struct grid_cell *gcp;
gcp = options_get_style(oo, name);
if (gcp->fg != 8)
diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h
index f6e6723b9e6..907058b13ce 100644
--- a/usr.bin/tmux/tmux.h
+++ b/usr.bin/tmux/tmux.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.695 2017/01/13 11:56:43 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.696 2017/01/13 11:58:49 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -1636,7 +1636,7 @@ struct options_entry *options_set_number(struct options *, const char *,
long long options_get_number(struct options *, const char *);
struct options_entry *options_set_style(struct options *, const char *, int,
const char *);
-struct grid_cell *options_get_style(struct options *, const char *);
+const struct grid_cell *options_get_style(struct options *, const char *);
/* options-table.c */
extern const struct options_table_entry options_table[];