[Qemacs-commit] qemacs clang.c libfbf.c cfb.c

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        15/10/13 20:54:01

Modified files:
        .              : clang.c libfbf.c cfb.c 

Log message:
        fix compilation errors on linux

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/clang.c?cvsroot=qemacs&r1=1.101&r2=1.102
http://cvs.savannah.gnu.org/viewcvs/qemacs/libfbf.c?cvsroot=qemacs&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/qemacs/cfb.c?cvsroot=qemacs&r1=1.11&r2=1.12

Patches:
Index: clang.c
===================================================================
RCS file: /sources/qemacs/qemacs/clang.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- clang.c     4 Oct 2015 17:16:12 -0000       1.101
+++ clang.c     13 Oct 2015 20:54:00 -0000      1.102
@@ -787,7 +787,7 @@
                 delim = '#';
                 goto parse_regex;
             }
-            if (flavor == CLANG_HAXE | flavor == CLANG_CBANG) {
+            if (flavor == CLANG_HAXE || flavor == CLANG_CBANG) {
                 i += get_c_identifier(kbuf, countof(kbuf), str + i, flavor);
                 // XXX: check for proper preprocessor directive?
                 SET_COLOR(str, start, i, C_STYLE_PREPROCESS);

Index: libfbf.c
===================================================================
RCS file: /sources/qemacs/qemacs/libfbf.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- libfbf.c    18 Apr 2008 16:25:07 -0000      1.10
+++ libfbf.c    13 Oct 2015 20:54:00 -0000      1.11
@@ -418,11 +418,12 @@
     unsigned char *p;
     unsigned char bitmap[WRAP * (MAXHEIGHT + MAXDIST)];
     int v, v1, x, y, b, i;
-    unsigned int lbuf, w1;
+    unsigned int lbuf;
+    //unsigned int w1;
 
     memset(bitmap, 1, sizeof(bitmap));
     p = bitmap + MAXDIST + WRAP * MAXDIST;
-    w1 = (w + 7) >> 3;
+    //w1 = (w + 7) >> 3;
     for (y = 0; y < h; y++) {
         lbuf = 0;
         for (x = 0; x < w; x++) {

Index: cfb.c
===================================================================
RCS file: /sources/qemacs/qemacs/cfb.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- cfb.c       16 Sep 2015 22:18:23 -0000      1.11
+++ cfb.c       13 Oct 2015 20:54:00 -0000      1.12
@@ -74,7 +74,7 @@
             d = dest;
             n = w;
 
-            if (((int)d & 3) != 0) {
+            if (((intptr_t)d & 3) != 0) {
                 ((uint16_t *)(void *)d)[0] = col;
                 d += 2;
                 n--;