config/output: Make merge_output_config static

8 months ago · c3fca26d30
parent 9becff0ba5
commit c3fca26d30
2 changed files with 1 additions and 3 deletions
--- a/include/sway/config.h
+++ b/include/sway/config.h
@ -688,8 +688,6 @@ const char *sway_output_scale_filter_to_string(enum scale_filter_mode scale_filt

 struct output_config *new_output_config(const char *name);

-void merge_output_config(struct output_config *dst, struct output_config *src);
-
 bool apply_output_configs(struct matched_output_config *configs,
 		size_t configs_len, bool test_only);

--- a/sway/config/output.c
+++ b/sway/config/output.c
@ -79,7 +79,7 @@ struct output_config *new_output_config(const char *name) {
 	return oc;
 }

-void merge_output_config(struct output_config *dst, struct output_config *src) {
+static void merge_output_config(struct output_config *dst, struct output_config *src) {
 	if (src->enabled != -1) {
 		dst->enabled = src->enabled;
 	}