summaryrefslogtreecommitdiff
path: root/gnu/packages/patches/mc-fix-ncurses-build.patch
blob: c583c92e1033c030128429c7500badd6ecfddf16 (about) (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
Patch cherry-picked from resolution of
http://www.midnight-commander.org/ticket/3114

--- a/lib/tty/key.c	(revision 0ed4a91d7df4e50512defd2e0734ecab7c9da07f)
+++ b/lib/tty/key.c	(revision d870aedad1907773f8586fe818a89e6b5178b849)
@@ -1947,4 +1947,5 @@
 {
     int c;
+    int flag = 0;               /* Return value from select */
 #ifdef HAVE_LIBGPM
     static struct Gpm_Event ev; /* Mouse event */
@@ -1979,5 +1980,4 @@
     {
         int nfd;
-        static int flag = 0;    /* Return value from select */
         fd_set select_set;
 
--- a/lib/tty/tty-ncurses.c	(revision bb65b467900ea9eb1f7867c059fd26fac86c747c)
+++ b/lib/tty/tty-ncurses.c	(revision d870aedad1907773f8586fe818a89e6b5178b849)
@@ -50,4 +50,5 @@
 #include "tty.h"
 #include "color-internal.h"
+#include "key.h"
 #include "mouse.h"
 #include "win.h"
@@ -531,4 +532,5 @@
     {
         int res;
+        unsigned char str[UTF8_CHAR_LEN + 1];
 
         res = g_unichar_to_utf8 (c, (char *) str);
@@ -541,5 +543,4 @@
         else
         {
-            unsigned char str[UTF8_CHAR_LEN + 1];
             const char *s;