Merge branch 'sunweaver-pr/nxagent-no-compiler-warnings' into arctica-3.6.x

Attributes GH PR #102: https://github.com/ArcticaProject/nx-libs/pull/102

1 files changed, 22 insertions, 22 deletions

diff --git a/nx-X11/programs/Xserver/mi/miscrinit.c b/nx-X11/programs/Xserver/mi/miscrinit.c
index 4950eaa93..addd5dd64 100644
--- a/nx-X11/programs/Xserver/mi/miscrinit.c
+++ b/nx-X11/programs/Xserver/mi/miscrinit.c
@@ -267,31 +267,31 @@ miScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width,
     /* CreateColormap, DestroyColormap, InstallColormap, UninstallColormap */
     /* ListInstalledColormaps, StoreColors, ResolveColor */
 #ifdef NEED_SCREEN_REGIONS
-    pScreen->RegionCreate = miRegionCreate;
-    pScreen->RegionInit = miRegionInit;
-    pScreen->RegionCopy = miRegionCopy;
-    pScreen->RegionDestroy = miRegionDestroy;
-    pScreen->RegionUninit = miRegionUninit;
-    pScreen->Intersect = miIntersect;
-    pScreen->Union = miUnion;
-    pScreen->Subtract = miSubtract;
-    pScreen->Inverse = miInverse;
-    pScreen->RegionReset = miRegionReset;
-    pScreen->TranslateRegion = miTranslateRegion;
-    pScreen->RectIn = miRectIn;
-    pScreen->PointInRegion = miPointInRegion;
-    pScreen->RegionNotEmpty = miRegionNotEmpty;
-    pScreen->RegionEqual = miRegionEqual;
-    pScreen->RegionBroken = miRegionBroken;
-    pScreen->RegionBreak = miRegionBreak;
-    pScreen->RegionEmpty = miRegionEmpty;
-    pScreen->RegionExtents = miRegionExtents;
-    pScreen->RegionAppend = miRegionAppend;
-    pScreen->RegionValidate = miRegionValidate;
+    pScreen->RegionCreate = RegionCreate;
+    pScreen->RegionInit = RegionInit;
+    pScreen->RegionCopy = RegionCopy;
+    pScreen->RegionDestroy = RegionDestroy;
+    pScreen->RegionUninit = RegionUninit;
+    pScreen->Intersect = RegionIntersect;
+    pScreen->Union = RegionUnion;
+    pScreen->Subtract = RegionSubtract;
+    pScreen->Inverse = RegionInverse;
+    pScreen->RegionReset = RegionReset;
+    pScreen->TranslateRegion = RegionTranslate;
+    pScreen->RectIn = RegionContainsRect;
+    pScreen->PointInRegion = RegionContainsPoint;
+    pScreen->RegionNotEmpty = RegionNotEmpty;
+    pScreen->RegionEqual = RegionEqual;
+    pScreen->RegionBroken = RegionBroken;
+    pScreen->RegionBreak = RegionBreak;
+    pScreen->RegionEmpty = RegionEmpty;
+    pScreen->RegionExtents = RegionExtents;
+    pScreen->RegionAppend = RegionAppend;
+    pScreen->RegionValidate = RegionValidate;
 #endif /* NEED_SCREEN_REGIONS */
     /* BitmapToRegion */
 #ifdef NEED_SCREEN_REGIONS
-    pScreen->RectsToRegion = miRectsToRegion;
+    pScreen->RectsToRegion = RegionFromRects;
 #endif /* NEED_SCREEN_REGIONS */
     pScreen->SendGraphicsExpose = miSendGraphicsExpose;
     pScreen->BlockHandler = (ScreenBlockHandlerProcPtr)NoopDDA;