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.

objects/enhmetafile.c

diff --git a/objects/enhmetafile.c b/objects/enhmetafile.c
index 6a4e3f8..7cca796 100644
--- a/objects/enhmetafile.c
+++ b/objects/enhmetafile.c
@@ -177,9 +177,9 @@
     if (!buf) return sizeof(ENHMETAHEADER);
     emh = EMF_GetEnhMetaHeader(hmf);
     if(!emh) return FALSE;
-    memmove(buf, emh, MIN(sizeof(ENHMETAHEADER), bufsize));
+    memmove(buf, emh, min(sizeof(ENHMETAHEADER), bufsize));
     EMF_ReleaseEnhMetaHeader(hmf);
-    return MIN(sizeof(ENHMETAHEADER), bufsize);
+    return min(sizeof(ENHMETAHEADER), bufsize);
 }
 
 
@@ -213,7 +213,7 @@
  		 size - first - 1);
  
      EMF_ReleaseEnhMetaHeader(hmf);
-     return MIN(size, emh->nDescription);
+     return min(size, emh->nDescription);
 }
 
 /*****************************************************************************
@@ -244,9 +244,9 @@
      }
  
      memmove(buf, (char *) emh + emh->offDescription, 
- 	    MIN(size,emh->nDescription));
+ 	    min(size,emh->nDescription));
      EMF_ReleaseEnhMetaHeader(hmf);
-     return MIN(size, emh->nDescription);
+     return min(size, emh->nDescription);
 }
 
 /****************************************************************************
@@ -303,7 +303,7 @@
   }
 
   /* Copy the lesser of the two byte counts */
-  uEnhMetaFileSize = MIN( uEnhMetaFileSize, bufsize );
+  uEnhMetaFileSize = min( uEnhMetaFileSize, bufsize );
 
   /* Copy everything */
   lpEnhMetaFile = EMF_GetEnhMetaHeader( hmf );
@@ -1375,7 +1375,7 @@
   {
     PEMREOF lpEof = (PEMREOF)lpEMR;
     EMF_PaletteCopy* info = (EMF_PaletteCopy*)lpData;
-    DWORD dwNumPalToCopy = MIN( lpEof->nPalEntries, info->cEntries );
+    DWORD dwNumPalToCopy = min( lpEof->nPalEntries, info->cEntries );
 
     TRACE( "copying 0x%08lx palettes\n", dwNumPalToCopy );