diff options
| author | wtc%netscape.com <devnull@localhost> | 2002-03-27 07:29:57 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2002-03-27 07:29:57 +0000 |
| commit | 486a8bfb5432e665a3d078d5d2cc5090cd4edbcf (patch) | |
| tree | 65263f54980555ca86f763c8a9e9cd60d79cb15d | |
| parent | a86b2af001981c50b6dfa8c049b95c969c08d67c (diff) | |
| parent | 33dc8a627d2e6d33bad312472cf0673bb3d2ade6 (diff) | |
| download | nss-hg-486a8bfb5432e665a3d078d5d2cc5090cd4edbcf.tar.gz | |
Bugzilla bug 133668: use PR_MIN instead of MIN, which is no longer defined
by the Mozilla header file that we include.
| -rw-r--r-- | security/nss/lib/freebl/mac_rand.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/nss/lib/freebl/mac_rand.c b/security/nss/lib/freebl/mac_rand.c index 8578dfa08..27efdde68 100644 --- a/security/nss/lib/freebl/mac_rand.c +++ b/security/nss/lib/freebl/mac_rand.c @@ -297,11 +297,11 @@ void FE_ReadScreen() offset = ( rowBytes * y ) + (UInt32)( (float)x * bytesPerPixel ); /* don't read past the end of the pixmap's rowbytes */ - bytesToRead = MIN( (UInt32)( w * bytesPerPixel ), + bytesToRead = PR_MIN( (UInt32)( w * bytesPerPixel ), (UInt32)( rowBytes - ( x * bytesPerPixel ) ) ); /* don't read past the end of the graphics device pixmap */ - rowsToRead = MIN( h, + rowsToRead = PR_MIN( h, ( screenHeight - y ) ); p = GetPixBaseAddr( pmap ) + offset; |