13926b7
From 61ed0988a8e66e8e76b3a6cd050b3992318f8043 Mon Sep 17 00:00:00 2001
13926b7
From: Robin Lee <cheeselee@fedoraproject.org>
13926b7
Date: Thu, 20 Feb 2020 14:15:27 +0800
13926b7
Subject: [PATCH] Fix multiple definition errors
13926b7
13926b7
---
13926b7
 gcin-common.cpp | 6 ++++--
13926b7
 1 file changed, 4 insertions(+), 2 deletions(-)
13926b7
13926b7
diff --git a/gcin-common.cpp b/gcin-common.cpp
13926b7
index 2595c98..3fcf0e8 100644
13926b7
--- a/gcin-common.cpp
13926b7
+++ b/gcin-common.cpp
13926b7
@@ -5,9 +5,8 @@
13926b7
 void flush_tsin_buffer();
13926b7
 #endif
13926b7
 extern gboolean test_mode;
13926b7
-PIN_JUYIN *pin_juyin;
13926b7
 
13926b7
-int text_pho_N=3;
13926b7
+extern int text_pho_N;
13926b7
 
13926b7
 gboolean b_use_full_space = TRUE;
13926b7
 
13926b7
@@ -62,6 +61,9 @@ void disp_pho_sub(GtkWidget *label, int index, char *pho)
13926b7
   if (!label)
13926b7
     return;
13926b7
 
13926b7
+  if (text_pho_N == 0)
13926b7
+      text_pho_N = 3;
13926b7
+
13926b7
   if (index>=text_pho_N)
13926b7
     return;
13926b7
 
13926b7
-- 
13926b7
2.21.1
13926b7