1*4882a593SmuzhiyunFrom a8fd4b1f563d24d4296c3e8225c8404e2724d4c2 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Jordan Christiansen <xordspar0@gmail.com> 3*4882a593SmuzhiyunDate: Sun, 15 Mar 2020 16:55:33 -0500 4*4882a593SmuzhiyunSubject: [PATCH] Remove redundant demoextend definition 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunGCC 10 enables -fno-common by default, which causes the linker to fail when 7*4882a593Smuzhiyunthere are multple definitions of a global variable. 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunSee https://gcc.gnu.org/gcc-10/porting_to.html 10*4882a593Smuzhiyun 11*4882a593Smuzhiyun[Retrieved from: 12*4882a593Smuzhiyunhttps://github.com/chocolate-doom/chocolate-doom/commit/a8fd4b1f563d24d4296c3e8225c8404e2724d4c2] 13*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 14*4882a593Smuzhiyun--- 15*4882a593Smuzhiyun src/hexen/mn_menu.c | 1 - 16*4882a593Smuzhiyun 1 file changed, 1 deletion(-) 17*4882a593Smuzhiyun 18*4882a593Smuzhiyundiff --git a/src/hexen/mn_menu.c b/src/hexen/mn_menu.c 19*4882a593Smuzhiyunindex 059f45b3e..a97b7fcd1 100644 20*4882a593Smuzhiyun--- a/src/hexen/mn_menu.c 21*4882a593Smuzhiyun+++ b/src/hexen/mn_menu.c 22*4882a593Smuzhiyun@@ -131,7 +131,6 @@ boolean MenuActive; 23*4882a593Smuzhiyun int InfoType; 24*4882a593Smuzhiyun int messageson = true; 25*4882a593Smuzhiyun boolean mn_SuicideConsole; 26*4882a593Smuzhiyun-boolean demoextend; // from h2def.h 27*4882a593Smuzhiyun 28*4882a593Smuzhiyun // PRIVATE DATA DEFINITIONS ------------------------------------------------ 29*4882a593Smuzhiyun 30