AndrewCrewKuznetsov / xneur-devel

Xneur main repository
55 stars 25 forks source link

Fixes to compile with GCC 10+ #65

Open vp1981 opened 4 years ago

vp1981 commented 4 years ago

Hello, the patch below allows to build xneur (from git) with gcc 10+. I tested only the build but didn't run in production environment.

From 3d2ca4f17a12236f730b702ce7aad8919d3ec67a Mon Sep 17 00:00:00 2001
From: Vladimir Lomov <vladimir@node2-smoon7.bkoty.ru>
Date: Wed, 1 Jul 2020 11:56:40 +0800
Subject: [PATCH 3/3] xneur: adapted code for GCC 10+

Signed-off-by: Vladimir Lomov <vladimir@node2-smoon7.bkoty.ru>
---
 xneur/lib/lib/xneur.h    | 6 +++---
 xneur/lib/main/program.c | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/xneur/lib/lib/xneur.h b/xneur/lib/lib/xneur.h
index b249f7c..1193d28 100644
--- a/xneur/lib/lib/xneur.h
+++ b/xneur/lib/lib/xneur.h
@@ -32,10 +32,10 @@
 #  include <enchant-2/enchant.h>
 #endif

-struct _window *main_window;
+extern struct _window *main_window;

-int has_x_input_extension;
-int xi_opcode;
+extern int has_x_input_extension;
+extern int xi_opcode;

 struct _xneur_language
 {
diff --git a/xneur/lib/main/program.c b/xneur/lib/main/program.c
index e08fdef..ff82e80 100644
--- a/xneur/lib/main/program.c
+++ b/xneur/lib/main/program.c
@@ -96,7 +96,9 @@ static const char *normal_action_names[] =    {

 extern struct _xneur_config *xconfig;

-struct _window *main_window;
+struct _window *main_window = NULL;
+int has_x_input_extension = 0;
+int xi_opcode = 0;

 int last_event_type = 0;

-- 
2.27.0
gerasiov commented 3 years ago

https://salsa.debian.org/debian/xneur/-/blob/master/debian/patches/gcc-10.patch