mirror of
https://github.com/alliedmodders/hl2sdk.git
synced 2026-10-12 05:48:00 +08:00
Fixed conflict between min/max macros and std::min/max when using GCC >= 4.2.
This commit is contained in:
1 parent
b9b7f08197
commit
3e7f7bdabd
300 files changed
+1041
-1084
No files matched your search
@@ -17,7 +17,7 @@
|
||||
#include "tier0/memdbgon.h"
|
||||
|
||||
#ifndef min
|
||||
#define min(a, b) (((a) < (b)) ? (a) : (b))
|
||||
#define MIN(a, b) (((a) < (b)) ? (a) : (b))
|
||||
#endif
|
||||
|
||||
using namespace vgui;
|
||||
@@ -89,7 +89,7 @@ void CBitmapImagePanel::ComputeImagePosition(int &x, int &y, int &w, int &h)
|
||||
{
|
||||
float xScale = (float)panelWide / (float)imageWide;
|
||||
float yScale = (float)panelTall / (float)imageTall;
|
||||
float scale = min( xScale, yScale );
|
||||
float scale = MIN( xScale, yScale );
|
||||
|
||||
w = (int) (imageWide * scale);
|
||||
h = (int) (imageTall * scale);
|
||||
|
||||
Reference in new issue
Block a user