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.

files/dos_fs.c

diff --git a/files/dos_fs.c b/files/dos_fs.c
index 69e6dab..4ba1c23 100644
--- a/files/dos_fs.c
+++ b/files/dos_fs.c
@@ -524,7 +524,7 @@
 
     const char *p = strchr( name, '/' );
     int len = p ? (int)(p - name) : strlen(name);
-    if ((p = strchr( name, '\\' ))) len = MIN( (int)(p - name), len );
+    if ((p = strchr( name, '\\' ))) len = min( (int)(p - name), len );
     /* Ignore trailing dots */
     while (len > 1 && name[len-1] == '.') len--;
     if (long_len < len + 1) return FALSE;

files/drive.c

diff --git a/files/drive.c b/files/drive.c
index 5dc15b4..24dc0b1 100644
--- a/files/drive.c
+++ b/files/drive.c
@@ -923,7 +923,7 @@
     assert(s);
     ret = strlen(s) + 3; /* length of WHOLE current directory */
     if (ret >= buflen) return ret + 1;
-    lstrcpynA( buf, "A:\\", MIN( 4, buflen ) );
+    lstrcpynA( buf, "A:\\", min( 4, buflen ) );
     if (buflen) buf[0] += DRIVE_GetCurrentDrive();
     if (buflen > 3) lstrcpynA( buf + 3, s, buflen - 3 );
     return ret;

files/file.c

diff --git a/files/file.c b/files/file.c
index 7369123..76c2c65 100644
--- a/files/file.c
+++ b/files/file.c
@@ -1488,7 +1488,7 @@
  */
 UINT WINAPI SetHandleCount( UINT count )
 {
-    return MIN( 256, count );
+    return min( 256, count );
 }
 
 

files/profile.c

diff --git a/files/profile.c b/files/profile.c
index 10dfbd7..bcac788 100644
--- a/files/profile.c
+++ b/files/profile.c
@@ -149,7 +149,7 @@
             const char *env_p;
             const char *p2 = strchr( p, '}' );
             if (!p2) continue;  /* ignore it */
-            lstrcpynA(env_val, p + 2, MIN( sizeof(env_val), (int)(p2-p)-1 ));
+            lstrcpynA(env_val, p + 2, min( sizeof(env_val), (int)(p2-p)-1 ));
             if ((env_p = getenv( env_val )) != NULL)
             {
                 lstrcpynA( buffer, env_p, len );