Conflict resolution.

2021-11-13 22:49:19 +01:00
parent b0fe3d8f0f 66a5b0fb11
commit 3730117a37
26 changed files with 240 additions and 74 deletions
--- a/src/include/86box/win.h
+++ b/src/include/86box/win.h
@@ -129,6 +129,7 @@ extern void	do_start(void);
 extern void	do_stop(void);

 /* Internal platform support functions. */
+extern int	has_language_changed(int id);
 extern void	set_language(int id);
 extern int	get_vidpause(void);
 extern void	show_cursor(int);