commit 6d77d3a1df2f707ed7543febf9364152cfcde9c7
author Francois Gouget <fgouget@psn.net> Sat Mar 25 21:44:35 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat Mar 25 21:44:35 2000 +0000
tree 17dbd46ac127d5268fecf2f15fa3eecaac0c9af9
parent 77c30552aae7d4afa9b8a69b839b13efaabbf7e6

Use min/max instead of MIN/MAX.

controls/scroll.c

diff --git a/controls/scroll.c b/controls/scroll.c
index 6748222..1bd8721 100644
--- a/controls/scroll.c
+++ b/controls/scroll.c
@@ -255,7 +255,7 @@
         }
         else
         {
-            INT max = info->MaxVal - MAX( info->Page-1, 0 );
+            INT max = info->MaxVal - max( info->Page-1, 0 );
             if (info->MinVal >= max)
                 *thumbPos = *arrowSize - SCROLL_ARROW_THUMB_OVERLAP;
             else
@@ -292,7 +292,7 @@
 
     if ((pixels -= thumbSize) <= 0) return infoPtr->MinVal;
 
-    pos = MAX( 0, pos - (GetSystemMetrics(SM_CXVSCROLL) - SCROLL_ARROW_THUMB_OVERLAP) );
+    pos = max( 0, pos - (GetSystemMetrics(SM_CXVSCROLL) - SCROLL_ARROW_THUMB_OVERLAP) );
     if (pos > pixels) pos = pixels;
 
     if (!infoPtr->Page) pos *= infoPtr->MaxVal - infoPtr->MinVal;
@@ -1350,8 +1350,8 @@
 
     if (infoPtr->CurVal < infoPtr->MinVal)
         infoPtr->CurVal = infoPtr->MinVal;
-    else if (infoPtr->CurVal > infoPtr->MaxVal - MAX( infoPtr->Page-1, 0 ))
-        infoPtr->CurVal = infoPtr->MaxVal - MAX( infoPtr->Page-1, 0 );
+    else if (infoPtr->CurVal > infoPtr->MaxVal - max( infoPtr->Page-1, 0 ))
+        infoPtr->CurVal = infoPtr->MaxVal - max( infoPtr->Page-1, 0 );
 
     TRACE("    new values: page=%d pos=%d min=%d max=%d\n",
 		 infoPtr->Page, infoPtr->CurVal,
@@ -1367,7 +1367,7 @@
     if (info->fMask & (SIF_RANGE | SIF_PAGE | SIF_DISABLENOSCROLL))
     {
         new_flags = infoPtr->flags;
-        if (infoPtr->MinVal >= infoPtr->MaxVal - MAX( infoPtr->Page-1, 0 ))
+        if (infoPtr->MinVal >= infoPtr->MaxVal - max( infoPtr->Page-1, 0 ))
         {
             /* Hide or disable scroll-bar */
             if (info->fMask & SIF_DISABLENOSCROLL)