mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-26 17:34:24 +02:00
Code Issues Projects Releases Wiki Activity

- patch to compile on gcc 4.7

Browse Source
This commit is contained in:
Mark Vejvoda
2012-05-01 14:55:06 +00:00
parent 2c8b1739e5
commit a70b1a9881
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/shared_lib/include/graphics/math_util.h
View File

@@ -184,10 +184,10 @@ public:
Rect2<T> computeBoundingRect() const{ Rect2<T> computeBoundingRect() const{
return Rect2i( return Rect2i(
min(p[0].x, p[1].x), std::min(p[0].x, p[1].x),
min(p[0].y, p[2].y), std::min(p[0].y, p[2].y),
max(p[2].x, p[3].x), std::max(p[2].x, p[3].x),
max(p[1].y, p[3].y)); std::max(p[1].y, p[3].y));
} }
bool isInside(const Vec2<T> &pt) const{ bool isInside(const Vec2<T> &pt) const{

2
source/shared_lib/sources/util/util.cpp
View File

@@ -22,6 +22,8 @@
#ifdef WIN32 #ifdef WIN32
#include <io.h> // for open() #include <io.h> // for open()
#else
#include <unistd.h>
#endif #endif
#include <sys/stat.h> // for open() #include <sys/stat.h> // for open()