Lucio Andrés Illanes Albornoz 2a75fc
--- xorg-server-1.20.1.orig/hw/xwin/winwindow.c	2018-08-07 18:31:04.000000000 +0200
Lucio Andrés Illanes Albornoz 2a75fc
+++ xorg-server-1.20.1/hw/xwin/winwindow.c	2018-08-22 19:39:37.078925268 +0200
Lucio Andrés Illanes Albornoz 2a75fc
@@ -269,14 +269,14 @@
Lucio Andrés Illanes Albornoz 2a75fc
 
Lucio Andrés Illanes Albornoz 2a75fc
             if (pWinPriv->hRgn) {
Lucio Andrés Illanes Albornoz 2a75fc
                 if (CombineRgn(hRgnWin, hRgnWin, pWinPriv->hRgn, RGN_AND)
Lucio Andrés Illanes Albornoz 2a75fc
-                    == ERROR) {
Lucio Andrés Illanes Albornoz 2a75fc
+                    == 0) {
Lucio Andrés Illanes Albornoz 2a75fc
                     ErrorF("winAddRgn - CombineRgn () failed\n");
Lucio Andrés Illanes Albornoz 2a75fc
                 }
Lucio Andrés Illanes Albornoz 2a75fc
             }
Lucio Andrés Illanes Albornoz 2a75fc
 
Lucio Andrés Illanes Albornoz 2a75fc
             OffsetRgn(hRgnWin, iX, iY);
Lucio Andrés Illanes Albornoz 2a75fc
 
Lucio Andrés Illanes Albornoz 2a75fc
-            if (CombineRgn(hRgn, hRgn, hRgnWin, RGN_OR) == ERROR) {
Lucio Andrés Illanes Albornoz 2a75fc
+            if (CombineRgn(hRgn, hRgn, hRgnWin, RGN_OR) == 0) {
Lucio Andrés Illanes Albornoz 2a75fc
                 ErrorF("winAddRgn - CombineRgn () failed\n");
Lucio Andrés Illanes Albornoz 2a75fc
             }
Lucio Andrés Illanes Albornoz 2a75fc
 
Lucio Andrés Illanes Albornoz 2a75fc
@@ -363,7 +363,7 @@
Lucio Andrés Illanes Albornoz 2a75fc
             }
Lucio Andrés Illanes Albornoz 2a75fc
 
Lucio Andrés Illanes Albornoz 2a75fc
             /* Merge the Windows region with the accumulated region */
Lucio Andrés Illanes Albornoz 2a75fc
-            if (CombineRgn(hRgn, hRgn, hRgnRect, RGN_OR) == ERROR) {
Lucio Andrés Illanes Albornoz 2a75fc
+            if (CombineRgn(hRgn, hRgn, hRgnRect, RGN_OR) == 0) {
Lucio Andrés Illanes Albornoz 2a75fc
                 ErrorF("winReshapeRootless - CombineRgn() failed\n");
Lucio Andrés Illanes Albornoz 2a75fc
             }
Lucio Andrés Illanes Albornoz 2a75fc
 
Lucio Andrés Illanes Albornoz 15b8a3
--- xorg-server-1.20.1.orig/hw/xwin/winmultiwindowshape.c       2018-08-07 18:31:04.000000000 +0200
Lucio Andrés Illanes Albornoz 15b8a3
+++ xorg-server-1.20.1/hw/xwin/winmultiwindowshape.c    2018-08-25 17:23:10.018564229 +0200
Lucio Andrés Illanes Albornoz 15b8a3
@@ -180,7 +180,7 @@
Lucio Andrés Illanes Albornoz 15b8a3
             }
Lucio Andrés Illanes Albornoz 15b8a3
Lucio Andrés Illanes Albornoz 15b8a3
             /* Merge the Windows region with the accumulated region */
Lucio Andrés Illanes Albornoz 15b8a3
-            if (CombineRgn(hRgn, hRgn, hRgnRect, RGN_OR) == ERROR) {
Lucio Andrés Illanes Albornoz 15b8a3
+            if (CombineRgn(hRgn, hRgn, hRgnRect, RGN_OR) == 0) {
Lucio Andrés Illanes Albornoz 15b8a3
                 ErrorF("winReshape - CombineRgn () failed: %d\n",
Lucio Andrés Illanes Albornoz 15b8a3
                        (int) GetLastError());
Lucio Andrés Illanes Albornoz 15b8a3
             }