aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Kenny Levinsen <kl@kl.wtf>2024-03-16 13:25:23 +0100
committerLibravatar Simon Ser <contact@emersion.fr>2024-03-28 10:45:20 +0100
commitc3fca26d303617614bee67ad766fd3cb95609245 (patch)
tree5c2538cf2075552f5d41c151c8e2e5fb013d027d
parentoutput/config: Remove reset_outputs and co. (diff)
downloadsway-c3fca26d303617614bee67ad766fd3cb95609245.tar.gz
sway-c3fca26d303617614bee67ad766fd3cb95609245.tar.zst
sway-c3fca26d303617614bee67ad766fd3cb95609245.zip
config/output: Make merge_output_config static
-rw-r--r--include/sway/config.h2
-rw-r--r--sway/config/output.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/include/sway/config.h b/include/sway/config.h
index 7e67ba21..5a303d9f 100644
--- 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
688 688
689struct output_config *new_output_config(const char *name); 689struct output_config *new_output_config(const char *name);
690 690
691void merge_output_config(struct output_config *dst, struct output_config *src);
692
693bool apply_output_configs(struct matched_output_config *configs, 691bool apply_output_configs(struct matched_output_config *configs,
694 size_t configs_len, bool test_only); 692 size_t configs_len, bool test_only);
695 693
diff --git a/sway/config/output.c b/sway/config/output.c
index a7c2f9b8..72cbf261 100644
--- a/sway/config/output.c
+++ b/sway/config/output.c
@@ -79,7 +79,7 @@ struct output_config *new_output_config(const char *name) {
79 return oc; 79 return oc;
80} 80}
81 81
82void merge_output_config(struct output_config *dst, struct output_config *src) { 82static void merge_output_config(struct output_config *dst, struct output_config *src) {
83 if (src->enabled != -1) { 83 if (src->enabled != -1) {
84 dst->enabled = src->enabled; 84 dst->enabled = src->enabled;
85 } 85 }