[Qemacs-commit] qemacs display.c display.h

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        15/09/16 21:43:22

Modified files:
        .              : display.c display.h 

Log message:
        portability: avoid using or pseudo-keyword

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/display.c?cvsroot=qemacs&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/qemacs/display.h?cvsroot=qemacs&r1=1.15&r2=1.16

Patches:
Index: display.c
===================================================================
RCS file: /sources/qemacs/qemacs/display.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- display.c   24 Jan 2014 00:46:26 -0000      1.16
+++ display.c   16 Sep 2015 21:43:22 -0000      1.17
@@ -171,15 +171,15 @@
     s->dpy.dpy_set_clip(s, x1, y1, x2 - x1, y2 - y1);
 }
 
-void push_clip_rectangle(QEditScreen *s, CSSRect *or, CSSRect *r)
+void push_clip_rectangle(QEditScreen *s, CSSRect *r0, CSSRect *r)
 {
     int x1, y1, x2, y2;
 
     /* save old rectangle */
-    or->x1 = s->clip_x1;
-    or->y1 = s->clip_y1;
-    or->x2 = s->clip_x2;
-    or->y2 = s->clip_y2;
+    r0->x1 = s->clip_x1;
+    r0->y1 = s->clip_y1;
+    r0->x2 = s->clip_x2;
+    r0->y2 = s->clip_y2;
 
     /* load and clip new rectangle against the current one */
     x1 = r->x1;

Index: display.h
===================================================================
RCS file: /sources/qemacs/qemacs/display.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- display.h   24 Jan 2014 00:46:26 -0000      1.15
+++ display.h   16 Sep 2015 21:43:22 -0000      1.16
@@ -246,7 +246,7 @@
 void fill_rectangle(QEditScreen *s,
                     int x1, int y1, int w, int h, QEColor color);
 void set_clip_rectangle(QEditScreen *s, CSSRect *r);
-void push_clip_rectangle(QEditScreen *s, CSSRect *or, CSSRect *r);
+void push_clip_rectangle(QEditScreen *s, CSSRect *r0, CSSRect *r);
 
 void free_font_cache(QEditScreen *s);
 QEFont *select_font(QEditScreen *s, int style, int size);