Backups/hl2sdk
1
0
Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-09-20 12:36:05 +08:00
Code Activity

Fixed conflict between min/max macros and std::min/max when using GCC >= 4.2.

Browse Source
This commit is contained in:
Scott Ehlert
2011-04-28 01:30:09 -05:00
parent b9b7f08197
commit 3e7f7bdabd
300 changed files with 1041 additions and 1084 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/zip_utils.cpp
View File

@ -544,7 +544,7 @@ void CZipFile::ParseFromBuffer( void *buffer, int bufferlength )
if ( rec.commentLength )
{
char commentString[128];
int commentLength = min( rec.commentLength, sizeof( commentString ) );
int commentLength = MIN( rec.commentLength, sizeof( commentString ) );
buf.Get( commentString, commentLength );
commentString[commentLength] = '\0';
ParseXZipCommentString( commentString );
@ -673,7 +673,7 @@ HANDLE CZipFile::ParseFromDisk( const char *pFilename )
if ( rec.commentLength )
{
char commentString[128];
int commentLength = min( rec.commentLength, sizeof( commentString ) );
int commentLength = MIN( rec.commentLength, sizeof( commentString ) );
CWin32File::FileRead( hFile, commentString, commentLength );
commentString[commentLength] = '\0';
ParseXZipCommentString( commentString );