changeset 3241:71c757f2a3c4

Fixed shadowed declaration of y1 (bits/mathcalls.h)
author unexist
date Wed, 19 Jun 2013 15:12:38 +0200
parents 5d8d64f95c49
children 4b3ad4a625ee c39a45123787
files src/subtlext/window.c
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/subtlext/window.c	Mon Mar 25 17:18:45 2013 +0100
+++ b/src/subtlext/window.c	Wed Jun 19 15:12:38 2013 +0200
@@ -955,13 +955,13 @@
   VALUE *argv,
   VALUE self)
 {
-  VALUE x1 = Qnil, x2 = Qnil, y1 = Qnil, y2 = Qnil, color = Qnil;
+  VALUE lx1 = Qnil, lx2 = Qnil, ly1 = Qnil, ly2 = Qnil, color = Qnil;
 
-  rb_scan_args(argc, argv, "41", &x1, &y1, &x2, &y2, &color);
+  rb_scan_args(argc, argv, "41", &lx1, &ly1, &lx2, &ly2, &color);
 
   /* Check object types */
-  if(FIXNUM_P(x1) && FIXNUM_P(y1) &&
-      FIXNUM_P(x2) && FIXNUM_P(x2))
+  if(FIXNUM_P(lx1) && FIXNUM_P(ly1) &&
+      FIXNUM_P(lx2) && FIXNUM_P(lx2))
     {
       SubtlextWindow *w = NULL;
 
@@ -983,8 +983,8 @@
 
           XChangeGC(display, w->gc, GCForeground|GCBackground, &gvals);
 
-          XDrawLine(display, w->win, w->gc, FIX2INT(x1),
-            FIX2INT(y1), FIX2INT(x2), FIX2INT(y2));
+          XDrawLine(display, w->win, w->gc, FIX2INT(lx1),
+            FIX2INT(ly1), FIX2INT(lx2), FIX2INT(ly2));
 
           XFlush(display);
         }