[Qemacs-commit] qemacs clang.c tty.c

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        17/03/16 13:18:29

Modified files:
        .              : clang.c tty.c 

Log message:
        fixed compilation on stack Debian

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/clang.c?cvsroot=qemacs&r1=1.113&r2=1.114
http://cvs.savannah.gnu.org/viewcvs/qemacs/tty.c?cvsroot=qemacs&r1=1.73&r2=1.74

Patches:
Index: clang.c
===================================================================
RCS file: /sources/qemacs/qemacs/clang.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -b -r1.113 -r1.114
--- clang.c     6 Mar 2017 12:53:53 -0000       1.113
+++ clang.c     16 Mar 2017 17:18:29 -0000      1.114
@@ -1503,17 +1503,18 @@
                              unsigned int *str, int n, ModeDef *syn)
 {
     int i = 0, start, i1, indent;
-    int c, style, type_decl, klen, delim, prev;
+    int c, style, klen, delim, prev;
     char kbuf[32];
     int mode_flags = syn->colorize_flags;
     int flavor = (mode_flags & CLANG_FLAVOR);
     int state = cp->colorize_state;
+    //int type_decl;  /* unused */
 
     indent = 0;
     //for (; qe_isblank(str[indent]); indent++) continue;
 
     start = i;
-    type_decl = 0;
+    //type_decl = 0;
     c = 0;
     style = 0;
 
@@ -1645,7 +1646,7 @@
         case '=':
             /* exit type declaration */
             /* does not handle this: int i = 1, j = 2; */
-            type_decl = 0;
+            //type_decl = 0;
             continue;
         case '<':       /* JavaScript extension */
             if (flavor == CLANG_JS) {
@@ -1689,7 +1690,7 @@
                 &&  !qe_findchar(".(:", str[i])
                 &&  strfind(syn->types, kbuf)) {
                     /* if not cast, assume type declaration */
-                    type_decl = 1;
+                    //type_decl = 1;
                     style = C_STYLE_TYPE;
                     break;
                 }

Index: tty.c
===================================================================
RCS file: /sources/qemacs/qemacs/tty.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- tty.c       16 Mar 2017 09:16:31 -0000      1.73
+++ tty.c       16 Mar 2017 17:18:29 -0000      1.74
@@ -1087,6 +1087,7 @@
 
 static void comb_cache_clean(TTYState *ts, const TTYChar *screen, int len) {
     unsigned int *ip;
+    int i;
 
     if (ts->comb_cache[0] == 0)
         return;
@@ -1095,7 +1096,7 @@
         *ip |= 0x10000;
     }
     ip = ts->comb_cache;
-    for (int i = 0; i < len; i++) {
+    for (i = 0; i < len; i++) {
         int ch = TTYCHAR_GETCH(screen[i]);
         if (ch >= TTYCHAR_COMB && ch < TTYCHAR_COMB + countof(ts->comb_cache) 
- 1) {
             ip[ch - TTYCHAR_COMB] &= ~0x10000;
@@ -1119,6 +1120,7 @@
 static void comb_cache_describe(QEditScreen *s, EditBuffer *b) {
     TTYState *ts = s->priv_data;
     unsigned int *ip;
+    unsigned int i;
 
     eb_printf(b, "Unicode combination cache:\n\n");
     
@@ -1129,7 +1131,7 @@
             eb_printf(b, "  %06X  %d:",
                       (unsigned int)(TTYCHAR_COMB + (ip - ts->comb_cache)),
                       (*ip & 0xFFFF) - 1);
-            for (unsigned int i = 1; i < (*ip & 0xFFFF); i++) {
+            for (i = 1; i < (*ip & 0xFFFF); i++) {
                 eb_printf(b, " %04X", ip[i]);
             }
             eb_printf(b, "\n");