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.

windows/rect.c

diff --git a/windows/rect.c b/windows/rect.c
index 1717cf8..1f48e77 100644
--- a/windows/rect.c
+++ b/windows/rect.c
@@ -183,10 +183,10 @@
 	SetRectEmpty16( dest );
 	return FALSE;
     }
-    dest->left   = MAX( src1->left, src2->left );
-    dest->right  = MIN( src1->right, src2->right );
-    dest->top    = MAX( src1->top, src2->top );
-    dest->bottom = MIN( src1->bottom, src2->bottom );
+    dest->left   = max( src1->left, src2->left );
+    dest->right  = min( src1->right, src2->right );
+    dest->top    = max( src1->top, src2->top );
+    dest->bottom = min( src1->bottom, src2->bottom );
     return TRUE;
 }
 
@@ -204,10 +204,10 @@
 	SetRectEmpty( dest );
 	return FALSE;
     }
-    dest->left   = MAX( src1->left, src2->left );
-    dest->right  = MIN( src1->right, src2->right );
-    dest->top    = MAX( src1->top, src2->top );
-    dest->bottom = MIN( src1->bottom, src2->bottom );
+    dest->left   = max( src1->left, src2->left );
+    dest->right  = min( src1->right, src2->right );
+    dest->top    = max( src1->top, src2->top );
+    dest->bottom = min( src1->bottom, src2->bottom );
     return TRUE;
 }
 
@@ -232,10 +232,10 @@
 	if (IsRectEmpty16(src2)) *dest = *src1;
 	else
 	{
-	    dest->left   = MIN( src1->left, src2->left );
-	    dest->right  = MAX( src1->right, src2->right );
-	    dest->top    = MIN( src1->top, src2->top );
-	    dest->bottom = MAX( src1->bottom, src2->bottom );	    
+	    dest->left   = min( src1->left, src2->left );
+	    dest->right  = max( src1->right, src2->right );
+	    dest->top    = min( src1->top, src2->top );
+	    dest->bottom = max( src1->bottom, src2->bottom );	    
 	}
     }
     return TRUE;
@@ -262,10 +262,10 @@
 	if (IsRectEmpty(src2)) *dest = *src1;
 	else
 	{
-	    dest->left   = MIN( src1->left, src2->left );
-	    dest->right  = MAX( src1->right, src2->right );
-	    dest->top    = MIN( src1->top, src2->top );
-	    dest->bottom = MAX( src1->bottom, src2->bottom );	    
+	    dest->left   = min( src1->left, src2->left );
+	    dest->right  = max( src1->right, src2->right );
+	    dest->top    = min( src1->top, src2->top );
+	    dest->bottom = max( src1->bottom, src2->bottom );	    
 	}
     }
     return TRUE;