Merge branch 'master' into qt

src/include/86box/plat.h

@@ -65,13 +65,17 @@ extern int strnicmp(const char* s1, const char* s2, size_t n);
 
 
 #ifdef __cplusplus
+#include <atomic>
+#define atomic_flag std::atomic_flag
 extern "C" {
+#else
+#include <stdatomic.h>
 #endif
 
 /* Global variables residing in the platform module. */
 extern int	dopause,			/* system is paused */
-		doresize,			/* screen resize requested */
 		mouse_capture;			/* mouse is captured in app */
+extern atomic_flag doresize;			/* screen resize requested */
 extern volatile int	is_quit;				/* system exit requested */
 
 #ifdef MTR_ENABLED