[patch] tvision-2.1.0_pre2-gcc6.patch

tvision-2.1.0_pre2-gcc6.patch (text/plain), 5.79 KB, created by Peter Levine on 2016-09-23 06:24:58 UTC

--- tvision/classes/tdesktop.cc.old	2016-09-23 01:23:43.486475171 -0400
+++ tvision/classes/tdesktop.cc	2016-09-23 01:48:24.317057424 -0400
@@ -144,7 +144,7 @@
 {
     unsigned res1 = 2;
     unsigned res2 = i/res1;
-    while( abs( res1 - res2 ) > 1 )
+    while(( res1 - res2 ) > 1 )
         {
         res1 = (res1 + res2)/2;
         res2 = i/res1;
--- tvision/classes/tdisplay.cc.old	2016-09-23 01:21:06.442641396 -0400
+++ tvision/classes/tdisplay.cc	2016-09-23 01:53:47.451387431 -0400
@@ -381,10 +381,10 @@
  if (firstXMatch!=-1)
    {// Return the closest y that match x
     i=indexMin=firstXMatch;
-    minDif=abs(res[i].y-y);
+    minDif=res[i].y-y;
     while (++i<cant && res[i].x==x)
       {
-       dif=abs(res[i].y-y);
+       dif=res[i].y-y;
        if (dif<minDif)
          {
           minDif=dif;
@@ -396,11 +396,11 @@
    }
  // No x match, looks the one with minimum differences
  indexMin=0;
- minDif=abs(res[0].y-y)+abs(res[0].x-x);
+ minDif=((res[0].y-y)+(res[0].x-x));
  i=1;
  while (i<cant)
    {
-    dif=abs(res[i].y-y)+abs(res[i].x-x);
+    dif=((res[i].y-y)+(res[i].x-x));
     if (dif<minDif)
       {
        minDif=dif;
--- tvision/classes/tvtext1.cc.old	2016-09-23 01:54:40.504070359 -0400
+++ tvision/classes/tvtext1.cc	2016-09-23 01:57:58.344534952 -0400
@@ -110,10 +110,10 @@
 char TCheckBoxes::button[] = " [ ] ";
 char TCheckBoxes::obutton[] = " [ ] ";
 
-TScrollChars TScrollBar::vChars = {30, 31, 177, 254, 178}; // ±þ²
-TScrollChars TScrollBar::ovChars = {30, 31, 177, 254, 178}; // ±þ²
-TScrollChars TScrollBar::hChars = {17, 16, 177, 254, 178}; // ±þ²
-TScrollChars TScrollBar::ohChars = {17, 16, 177, 254, 178}; // ±þ²
+TScrollChars TScrollBar::vChars = {30, 31, (char) 177, (char) 254, (char) 178}; // ±þ²
+TScrollChars TScrollBar::ovChars = {30, 31, (char) 177, (char) 254, (char) 178}; // ±þ²
+TScrollChars TScrollBar::hChars = {17, 16, (char) 177, (char) 254, (char) 178}; // ±þ²
+TScrollChars TScrollBar::ohChars = {17, 16, (char) 177, (char) 254, (char) 178}; // ±þ²
 
 char TButton::shadows[] = "\xDC\xDB\xDF"; // ÜÛß
 char TButton::oshadows[] = "\xDC\xDB\xDF"; // ÜÛß
--- tvision/classes/x11/x11src.cc.old	2016-09-23 01:58:26.135462470 -0400
+++ tvision/classes/x11/x11src.cc	2016-09-23 02:04:25.335375715 -0400
@@ -2457,8 +2457,8 @@
  else
    {
     unsigned target=fW*fH;
-    int dif1=abs(8*16-target);
-    int dif2=abs(10*20-target);
+    int dif1=8*16-target;
+    int dif2=10*20-target;
     if (dif1<dif2)
        nFont=&font8x16;
     else
@@ -2555,49 +2555,49 @@
        TScreenX11::leftPtr;
 char   TScreenX11::busyCursorMap[]=
 {
- 0xff, 0xff, 0xff, 0x1f,
- 0xfd, 0xff, 0xff, 0x1f,
- 0xf9, 0xff, 0xff, 0x1f,
- 0xf1, 0xff, 0xff, 0x1f,
- 0xe1, 0x7f, 0xc0, 0x1f,
- 0xc1, 0x7f, 0xc0, 0x1f,
- 0x81, 0x3f, 0x80, 0x1f,
- 0x01, 0x9f, 0x3b, 0x1f,
- 0x01, 0xce, 0x7b, 0x1e,
- 0xc1, 0xef, 0xfb, 0x1e,
- 0xc9, 0xef, 0xf1, 0x18,
- 0x9d, 0xef, 0xf1, 0x18,
- 0x9f, 0xef, 0xfe, 0x18,
- 0x3f, 0x6f, 0xff, 0x1e,
- 0x3f, 0xcf, 0x7f, 0x1e,
- 0xff, 0x9f, 0x3f, 0x1f,
- 0xff, 0x3f, 0x80, 0x1f,
- 0xff, 0x7f, 0xc0, 0x1f,
- 0xff, 0x7f, 0xc0, 0x1f,
- 0xff, 0xff, 0xff, 0x1f
+ (char) 0xff, (char) 0xff, (char) 0xff, (char) 0x1f,
+ (char) 0xfd, (char) 0xff, (char) 0xff, (char) 0x1f,
+ (char) 0xf9, (char) 0xff, (char) 0xff, (char) 0x1f,
+ (char) 0xf1, (char) 0xff, (char) 0xff, (char) 0x1f,
+ (char) 0xe1, (char) 0x7f, (char) 0xc0, (char) 0x1f,
+ (char) 0xc1, (char) 0x7f, (char) 0xc0, (char) 0x1f,
+ (char) 0x81, (char) 0x3f, (char) 0x80, (char) 0x1f,
+ (char) 0x01, (char) 0x9f, (char) 0x3b, (char) 0x1f,
+ (char) 0x01, (char) 0xce, (char) 0x7b, (char) 0x1e,
+ (char) 0xc1, (char) 0xef, (char) 0xfb, (char) 0x1e,
+ (char) 0xc9, (char) 0xef, (char) 0xf1, (char) 0x18,
+ (char) 0x9d, (char) 0xef, (char) 0xf1, (char) 0x18,
+ (char) 0x9f, (char) 0xef, (char) 0xfe, (char) 0x18,
+ (char) 0x3f, (char) 0x6f, (char) 0xff, (char) 0x1e,
+ (char) 0x3f, (char) 0xcf, (char) 0x7f, (char) 0x1e,
+ (char) 0xff, (char) 0x9f, (char) 0x3f, (char) 0x1f,
+ (char) 0xff, (char) 0x3f, (char) 0x80, (char) 0x1f,
+ (char) 0xff, (char) 0x7f, (char) 0xc0, (char) 0x1f,
+ (char) 0xff, (char) 0x7f, (char) 0xc0, (char) 0x1f,
+ (char) 0xff, (char) 0xff, (char) 0xff, (char) 0x1f
 };
 char TScreenX11::busyCursorMask[]=
 {
- 0xfc, 0xff, 0xff, 0x1f,
- 0xf8, 0xff, 0xff, 0x1f,
- 0xf0, 0xff, 0xff, 0x1f,
- 0xe0, 0x3f, 0x80, 0x1f,
- 0xc0, 0x3f, 0x80, 0x1f,
- 0x80, 0x3f, 0x80, 0x1f,
- 0x00, 0x1f, 0x00, 0x1f,
- 0x00, 0x0e, 0x00, 0x1e,
- 0x00, 0x04, 0x00, 0x1c,
- 0x00, 0x04, 0x00, 0x10,
- 0x80, 0x07, 0x00, 0x10,
- 0x08, 0x07, 0x00, 0x10,
- 0x0c, 0x07, 0x00, 0x10,
- 0x1f, 0x06, 0x00, 0x10,
- 0x1f, 0x06, 0x00, 0x1c,
- 0x3f, 0x0f, 0x00, 0x1e,
- 0xff, 0x1f, 0x00, 0x1f,
- 0xff, 0x3f, 0x80, 0x1f,
- 0xff, 0x3f, 0x80, 0x1f,
- 0xff, 0x3f, 0x80, 0x1f
+ (char) 0xfc, (char) 0xff, (char) 0xff, (char) 0x1f,
+ (char) 0xf8, (char) 0xff, (char) 0xff, (char) 0x1f,
+ (char) 0xf0, (char) 0xff, (char) 0xff, (char) 0x1f,
+ (char) 0xe0, (char) 0x3f, (char) 0x80, (char) 0x1f,
+ (char) 0xc0, (char) 0x3f, (char) 0x80, (char) 0x1f,
+ (char) 0x80, (char) 0x3f, (char) 0x80, (char) 0x1f,
+ (char) 0x00, (char) 0x1f, (char) 0x00, (char) 0x1f,
+ (char) 0x00, (char) 0x0e, (char) 0x00, (char) 0x1e,
+ (char) 0x00, (char) 0x04, (char) 0x00, (char) 0x1c,
+ (char) 0x00, (char) 0x04, (char) 0x00, (char) 0x10,
+ (char) 0x80, (char) 0x07, (char) 0x00, (char) 0x10,
+ (char) 0x08, (char) 0x07, (char) 0x00, (char) 0x10,
+ (char) 0x0c, (char) 0x07, (char) 0x00, (char) 0x10,
+ (char) 0x1f, (char) 0x06, (char) 0x00, (char) 0x10,
+ (char) 0x1f, (char) 0x06, (char) 0x00, (char) 0x1c,
+ (char) 0x3f, (char) 0x0f, (char) 0x00, (char) 0x1e,
+ (char) 0xff, (char) 0x1f, (char) 0x00, (char) 0x1f,
+ (char) 0xff, (char) 0x3f, (char) 0x80, (char) 0x1f,
+ (char) 0xff, (char) 0x3f, (char) 0x80, (char) 0x1f,
+ (char) 0xff, (char) 0x3f, (char) 0x80, (char) 0x1f
 };
 
 /* This is the function which creates cursors. On success it return